From 6e364689d85a063c565039b519091a608e71c659 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:20:44 +0200 Subject: kdeartwork, kdebase, kdebindings, kdeedu, kdegames, kdegraphics 3.5.13 RPM --- redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec | 342 +++++++++++++++++++++ 1 file changed, 342 insertions(+) create mode 100644 redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec (limited to 'redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec') diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec new file mode 100644 index 000000000..b988eddca --- /dev/null +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -0,0 +1,342 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: cmake >= 2.8 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-kdegraphics +Version: %{?version} +Release: %{?release}%{?dist}%{_variant} +License: GPL +Summary: K Desktop Environment - Graphics Applications + +Group: Applications/Multimedia +Prefix: %{_prefix} + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Source0: kdegraphics-%{version}.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: gettext +BuildRequires: libmng-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: libungif-devel +BuildRequires: automake libtool +BuildRequires: gphoto2-devel +BuildRequires: sane-backends-devel +BuildRequires: libusb-devel + +# kgamma +BuildRequires: libXxf86vm-devel +# kuickshow +BuildRequires: imlib-devel +#kfile-plugin +BuildRequires: OpenEXR-devel +# kpdf +BuildRequires: freetype-devel +BuildRequires: poppler-qt-devel +BuildRequires: libpaper-devel +# ksvg +BuildRequires: fontconfig-devel +BuildRequires: fribidi-devel +BuildRequires: lcms-devel +BuildRequires: libart_lgpl-devel +BuildRequires: libXmu-devel +# kpovmodeler +BuildRequires: libGL-devel libGLU-devel libXi-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: trinity-kdelibs +Requires: ghostscript +Requires: %{name}-libs = %{version}-%{release} + +%if "%{_prefix}" == "/usr" +Provides: kdegraphics3 = %{version}-%{release} +Conflicts: kdegraphics +%endif + +%description +Graphics applications for the K Desktop Environment, including +* kamera (digital camera support) +* kcoloredit (palette editor and color chooser) +* kdvi (displays TeX .dvi files) +* kghostview (displays postscript files) +* kiconedit (icon editor) +* kooka (scanner application) +* kpdf (displays PDF files) +* kruler (screen ruler and color measurement tool) +* ksnapshot (screen capture utility) +* kview (image viewer for GIF, JPEG, TIFF, etc.) + +%package devel +Summary: Development files for %{name} +Provides: kdegraphics3-devel = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Group: Development/Libraries +%description devel +%{summary}. + +## FIXME: move more stuff to -extras +%package extras +Summary: Extra applications from %{name} +Group: Applications/Multimedia +Requires: %{name}-libs = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description extras +%{summary}, including: +* kfax +* kfaxview +* kpovmodler + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs >= %{version} +# include to be paranoid, installing libs-only is still mostly untested -- Rex +Requires: %{name} = %{version}-%{release} +%description libs +%{summary}. + + + +%prep +%setup -q -n kdegraphics + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-rpath \ + --disable-debug \ + --disable-warnings \ + --enable-final \ + --enable-closure \ + --includedir=%{_includedir}/kde \ + --with-extra-includes=%{_includedir}/tqt + +%if 0%{?fedora} >= 15 +# Ugly fix for kolourpaint - problem when linking libkdefx.so +sed -i kolourpaint/Makefile \ + -e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,' + +# Another ugly fix for kpdf - problem when linking fontconfig +sed -i kpdf/Makefile \ + -e '/^LDFLAGS = .*/ s,$, -lfontconfig,' +%endif + +%__make %{?_smp_mflags} + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} + +make install DESTDIR=%{buildroot} + +# locale's +%find_lang %{name} || touch %{name}.lang +HTML_DIR=$(kde-config --expandvars --install html) +if [ -d %{buildroot}$HTML_DIR ]; then +for lang_dir in %{buildroot}$HTML_DIR/* ; do + if [ -d $lang_dir ]; then + lang=$(basename $lang_dir) + echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang + # replace absolute symlinks with relative ones + pushd $lang_dir + for i in *; do + [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common + done + popd + fi +done +fi + +# rpmdocs +for dir in k* ; do + for file in AUTHORS ChangeLog README TODO ; do + if test -s "$dir/$file" ; then + install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" + echo "%doc rpmdocs/$dir/" >> %{name}.lang + fi + done +done + +# unpackaged files +# omit kpovmodeler-devel files (for now) -- Rex +rm -f %{buildroot}/libkpovmodeler.so + + +%clean +rm -rf %{buildroot} + + +%post +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post extras +/sbin/ldconfig ||: +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun extras +/sbin/ldconfig ||: +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%files extras +%defattr(-,root,root,-) + +# kfax +%doc rpmdocs/kfax/ +%{_bindir}/kfax +%{_datadir}/applications/kde/kfax.desktop +%{_datadir}/apps/kfax/ +%{_datadir}/icons/hicolor/??x??/apps/kfax.png +%{_datadir}/icons/hicolor/scalable/apps/kfax.svgz + +# kfaxview +%{_bindir}/kfaxview +%{_libdir}/libkfaximage.so +%{_libdir}/libkfaximage.la +%{tde_libdir}/kfaxviewpart.* +%{_datadir}/applications/kde/kfaxview.desktop +%{_datadir}/apps/kfaxview/ +%{_datadir}/icons/hicolor/??x??/apps/kfaxview.png +%{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz +%{_datadir}/services/kfaxmultipage.desktop +%{_datadir}/services/kfaxmultipage_tiff.desktop + +# kpovmodeler +%doc rpmdocs/kpovmodeler/ +%doc %{_docdir}/HTML/en/kpovmodeler/ +%{_bindir}/kpovmodeler +%{_libdir}/libkpovmodeler.so.* +%{_libdir}/libkpovmodeler.la +%{tde_libdir}/libkpovmodelerpart.* +%{_datadir}/applications/kde/kpovmodeler.desktop +%{_datadir}/apps/kpovmodeler/ +%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* +%{_datadir}/icons/hicolor/*/apps/kpovmodeler.* + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%doc rpmdocs/* + +# kfax +%exclude %{_bindir}/kfax +%exclude %{_datadir}/applications/kde/kfax.desktop +%exclude %{_datadir}/apps/kfax/ +%exclude %{_datadir}/icons/hicolor/*/apps/kfax.* + +# kfaxview +%exclude %{_bindir}/kfaxview +%exclude %{_libdir}/libkfaximage.so +%exclude %{_libdir}/libkfaximage.la +%exclude %{tde_libdir}/kfaxviewpart.* +%exclude %{_datadir}/applications/kde/kfaxview.desktop +%exclude %{_datadir}/apps/kfaxview/ +%exclude %{_datadir}/icons/hicolor/*/apps/kfaxview.* +%exclude %{_datadir}/services/kfaxmultipage.desktop +%exclude %{_datadir}/services/kfaxmultipage_tiff.desktop + +# kpovmodeler +%exclude %{tde_docdir}/HTML/en/kpovmodeler/ +%exclude %{_bindir}/kpovmodeler +%exclude %{_libdir}/libkpovmodeler.* +%exclude %{tde_libdir}/libkpovmodelerpart.* +%exclude %{_datadir}/applications/kde/kpovmodeler.desktop +%exclude %{_datadir}/apps/kpovmodeler/ +%exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* +%exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* + +%{_bindir}/* +%{_datadir}/applications/kde/*.desktop +%{_datadir}/applnk/Graphics/*kruler.desktop +%{_datadir}/apps/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/config*/* +%{_datadir}/service*/* +%{_datadir}/mimelnk/*/* +%{_libdir}/libkdeinit_*.so +%{tde_libdir}/* + +%files libs +%defattr(-,root,root,-) +%exclude %{_libdir}/libkfaximage.la +%exclude %{_libdir}/libkpovmodeler.la +%exclude %{_libdir}/libkpovmodeler.so.* +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la +# Why ??? +%{_libdir}/libdjvu.so + +%files devel +%defattr(-,root,root,-) +%{_includedir}/kde/* +%{_libdir}/lib*.so +#exclude %{_libdir}/libkpovmodeler.so +%exclude %{_libdir}/libkfaximage.so +%exclude %{_libdir}/libkdeinit_*.so +%exclude %{_libdir}/libdjvu.so + +%changelog +* Sun Sep 11 2011 Francois Andriot - 3.5.13-0 +- Import to GIT -- cgit v1.2.1 From 0061571b57d37f17c074ba869a674fb774fb49b4 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 18:36:20 +0100 Subject: TDE 3.5.13 stable release for RHEL/Fedora --- redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec | 117 ++++++++++++++------- 1 file changed, 80 insertions(+), 37 deletions(-) (limited to 'redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec') diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec index b988eddca..2133f4ddf 100644 --- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -12,10 +12,16 @@ # TDE 3.5.13 specific building variables BuildRequires: cmake >= 2.8 -%define tde_docdir %{_docdir} +%define tde_docdir %{_docdir}/kde %define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity +# KDEGRAPHICS specific options +%if 0%{?rhel} && 0%{?rhel} <= 5 +%define build_kpovmodeler 0 +%else +%define build_kpovmodeler 1 +%endif Name: trinity-kdegraphics Version: %{?version} @@ -30,8 +36,21 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source0: kdegraphics-%{version}.tar.gz +# TDE 3.5.13 +## RHEL / Fedora specific patches +### [kdegraphics/ksnapshot] Missing -lXext in LDFLAGS (required for Fedora 15) +Patch0: kdegraphics-3.5.13-ksnapshot_ldflags.patch +### [kdegraphics/kpovmodeler] CMAKE does not detect GL/glu.h (on RHEL5) +Patch1: kdegraphics-3.5.13-kpovmodeler_check_glu.patch +### [kdegraphics/kfile-plugins/dependencies/poppler-tqt] Compile 'poppler-tqt' only if HAVE_POPPLER_016 +Patch2: kdegraphics-3.5.13-disable_poppler.patch +### [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5 +Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel @@ -44,6 +63,8 @@ BuildRequires: automake libtool BuildRequires: gphoto2-devel BuildRequires: sane-backends-devel BuildRequires: libusb-devel +BuildRequires: t1lib-devel +BuildRequires: libdrm-devel # kgamma BuildRequires: libXxf86vm-devel @@ -53,7 +74,10 @@ BuildRequires: imlib-devel BuildRequires: OpenEXR-devel # kpdf BuildRequires: freetype-devel +BuildRequires: poppler-devel +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 BuildRequires: poppler-qt-devel +%endif BuildRequires: libpaper-devel # ksvg BuildRequires: fontconfig-devel @@ -61,8 +85,11 @@ BuildRequires: fribidi-devel BuildRequires: lcms-devel BuildRequires: libart_lgpl-devel BuildRequires: libXmu-devel + # kpovmodeler +%if 0%{?build_kpovmodeler} BuildRequires: libGL-devel libGLU-devel libXi-devel +%endif Requires: tqtinterface Requires: trinity-arts @@ -108,7 +135,9 @@ Requires(postun): /sbin/ldconfig %{summary}, including: * kfax * kfaxview +%if 0%{?build_kpovmodeler} * kpovmodler +%endif %package libs Summary: %{name} runtime libraries @@ -123,49 +152,44 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n kdegraphics - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%if 0%{?rhel} && 0%{?rhel} <= 5 +%patch3 -p1 +%endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" - -%configure \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-rpath \ - --disable-debug \ - --disable-warnings \ - --enable-final \ - --enable-closure \ - --includedir=%{_includedir}/kde \ - --with-extra-includes=%{_includedir}/tqt - -%if 0%{?fedora} >= 15 -# Ugly fix for kolourpaint - problem when linking libkdefx.so -sed -i kolourpaint/Makefile \ - -e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,' - -# Another ugly fix for kpdf - problem when linking fontconfig -sed -i kpdf/Makefile \ - -e '/^LDFLAGS = .*/ s,$, -lfontconfig,' +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export LD_LIBRARY_PATH="%{_libdir}" + +%__mkdir build +cd build +%cmake \ + -DWITH_T1LIB=ON \ + -DWITH_LIBPAPER=ON \ + -DWITH_TIFF=ON \ + -DWITH_OPENEXR=ON \ +%if 0%{?rhel} && 0%{?rhel} <= 5 + -DWITH_PDF=OFF \ +%else + -DWITH_PDF=ON \ +%endif + -DBUILD_ALL=ON \ +%if 0%{?build_kpovmodeler} == 0 + -DBUILD_KPOVMODELER=OFF \ %endif + .. %__make %{?_smp_mflags} %install export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build # locale's %find_lang %{name} || touch %{name}.lang @@ -201,7 +225,7 @@ rm -f %{buildroot}/libkpovmodeler.so %clean -rm -rf %{buildroot} +%__rm -rf %{buildroot} %post @@ -263,8 +287,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler +%if 0%{?build_kpovmodeler} %doc rpmdocs/kpovmodeler/ -%doc %{_docdir}/HTML/en/kpovmodeler/ +%doc %{tde_docdir}/HTML/en/kpovmodeler/ %{_bindir}/kpovmodeler %{_libdir}/libkpovmodeler.so.* %{_libdir}/libkpovmodeler.la @@ -273,6 +298,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/apps/kpovmodeler/ %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* +%endif %files -f %{name}.lang %defattr(-,root,root,-) @@ -297,6 +323,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler +%if 0%{?build_kpovmodeler} %exclude %{tde_docdir}/HTML/en/kpovmodeler/ %exclude %{_bindir}/kpovmodeler %exclude %{_libdir}/libkpovmodeler.* @@ -305,6 +332,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/apps/kpovmodeler/ %exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* +%endif %{_bindir}/* %{_datadir}/applications/kde/*.desktop @@ -317,12 +345,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mimelnk/*/* %{_libdir}/libkdeinit_*.so %{tde_libdir}/* +%doc %lang(en) %{tde_docdir}/HTML/en/* %files libs %defattr(-,root,root,-) %exclude %{_libdir}/libkfaximage.la +%if 0%{?build_kpovmodeler} %exclude %{_libdir}/libkpovmodeler.la %exclude %{_libdir}/libkpovmodeler.so.* +%endif %{_libdir}/lib*.so.* %{_libdir}/lib*.la # Why ??? @@ -330,7 +361,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files devel %defattr(-,root,root,-) -%{_includedir}/kde/* +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 +%{tde_includedir}/* +%endif +%{_includedir}/dom/* +%{_includedir}/ksvg/* +%{_includedir}/kviewshell/* +%{_includedir}/libtext2path-0.1/* +%{_includedir}/kmultipageInterface.h +%{_datadir}/cmake/*.cmake %{_libdir}/lib*.so #exclude %{_libdir}/libkpovmodeler.so %exclude %{_libdir}/libkfaximage.so @@ -338,5 +377,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libdjvu.so %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 +- RHEL 5 build has some features disabled (see patches) + * Sun Sep 11 2011 Francois Andriot - 3.5.13-0 - Import to GIT -- cgit v1.2.1 From 43240f192dbdd0c0d267bc7c4a96f123704f0e2b Mon Sep 17 00:00:00 2001 From: albator Date: Wed, 2 Nov 2011 22:50:25 +0100 Subject: RHEL5: corrects kpovmodeler compilation --- redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec') diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec index 2133f4ddf..fcb49e865 100644 --- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -16,12 +16,6 @@ BuildRequires: cmake >= 2.8 %define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity -# KDEGRAPHICS specific options -%if 0%{?rhel} && 0%{?rhel} <= 5 -%define build_kpovmodeler 0 -%else -%define build_kpovmodeler 1 -%endif Name: trinity-kdegraphics Version: %{?version} @@ -50,6 +44,8 @@ Patch1: kdegraphics-3.5.13-kpovmodeler_check_glu.patch Patch2: kdegraphics-3.5.13-disable_poppler.patch ### [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5 Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch +### [kdegraphics/kpovmodeler] CMAKE missing GLU_LIBRARIES +Patch4: kdegraphics-3.5.13-kpovmodeler_missing_gl_ldflags.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -87,9 +83,7 @@ BuildRequires: libart_lgpl-devel BuildRequires: libXmu-devel # kpovmodeler -%if 0%{?build_kpovmodeler} BuildRequires: libGL-devel libGLU-devel libXi-devel -%endif Requires: tqtinterface Requires: trinity-arts @@ -135,9 +129,7 @@ Requires(postun): /sbin/ldconfig %{summary}, including: * kfax * kfaxview -%if 0%{?build_kpovmodeler} * kpovmodler -%endif %package libs Summary: %{name} runtime libraries @@ -158,6 +150,7 @@ Requires: %{name} = %{version}-%{release} %if 0%{?rhel} && 0%{?rhel} <= 5 %patch3 -p1 %endif +%patch4 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -179,9 +172,6 @@ cd build -DWITH_PDF=ON \ %endif -DBUILD_ALL=ON \ -%if 0%{?build_kpovmodeler} == 0 - -DBUILD_KPOVMODELER=OFF \ -%endif .. %__make %{?_smp_mflags} @@ -287,7 +277,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler -%if 0%{?build_kpovmodeler} %doc rpmdocs/kpovmodeler/ %doc %{tde_docdir}/HTML/en/kpovmodeler/ %{_bindir}/kpovmodeler @@ -298,7 +287,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/apps/kpovmodeler/ %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* -%endif %files -f %{name}.lang %defattr(-,root,root,-) @@ -323,7 +311,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/services/kfaxmultipage_tiff.desktop # kpovmodeler -%if 0%{?build_kpovmodeler} %exclude %{tde_docdir}/HTML/en/kpovmodeler/ %exclude %{_bindir}/kpovmodeler %exclude %{_libdir}/libkpovmodeler.* @@ -332,7 +319,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_datadir}/apps/kpovmodeler/ %exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* %exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* -%endif %{_bindir}/* %{_datadir}/applications/kde/*.desktop @@ -350,10 +336,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files libs %defattr(-,root,root,-) %exclude %{_libdir}/libkfaximage.la -%if 0%{?build_kpovmodeler} %exclude %{_libdir}/libkpovmodeler.la %exclude %{_libdir}/libkpovmodeler.so.* -%endif %{_libdir}/lib*.so.* %{_libdir}/lib*.la # Why ??? @@ -377,6 +361,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libdjvu.so %changelog +* Wed Nov 02 2011 Francois Andriot - 3.5.13-2 +- Fix kpovmodeler compilation on RHEL 5 (patch4) + * Sun Oct 30 2011 Francois Andriot - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 - RHEL 5 build has some features disabled (see patches) -- cgit v1.2.1