From 16b7fe28e260d2dcaf6ee47fb8cd942960497ce5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 04 2007 16:29:11 +0000 Subject: - integrate former kdegraphics-extras bits (kuickshow, OpenEXR kfile plugin) - drop unecessary/upstreamed kpdf-xft patch4 (kde bug #123417) - prune pre-3.0 changelog --- diff --git a/kdegraphics-3.5.2-kpdf-xft.patch b/kdegraphics-3.5.2-kpdf-xft.patch deleted file mode 100644 index 82babd2..0000000 --- a/kdegraphics-3.5.2-kpdf-xft.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- kdegraphics-3.5.2/kpdf/configure.in.in.kpdf-xft 2006-03-17 11:11:19.000000000 +0100 -+++ kdegraphics-3.5.2/kpdf/configure.in.in 2006-04-04 17:54:13.000000000 +0200 -@@ -40,6 +40,9 @@ - if "$XFT_CONFIG"; then - XFT_CFLAGS="`$XFT_CONFIG --cflags`" - XFT_LIBS="`$XFT_CONFIG --libs`" -+ else -+ XFT_CFLAGS="`pkg-config xft --cflags 2>/dev/null`" -+ XFT_LIBS="`pkg-config xft --libs 2>/dev/null`" - fi - AC_SUBST(XFT_CFLAGS) - AC_SUBST(XFT_LIBS) diff --git a/kdegraphics.spec b/kdegraphics.spec index 4f313f3..cc24e2f 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,10 +1,10 @@ -%define rhel 0 + %define debug 0 -%define final 0 -%define make_cvs 1 +%define final 1 +%define make_cvs 0 Version: 3.5.6 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 @@ -17,7 +17,6 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.b Patch1: kdegraphics-3.3.0-misc.patch Patch2: kdegraphics-3.3.1-xorg.patch Patch3: kdegraphics-3.5.1-warning.patch -Patch4: kdegraphics-3.5.2-kpdf-xft.patch Requires: kdelibs >= 6:%{version} Requires: ghostscript @@ -38,34 +37,37 @@ BuildRequires: sane-backends-devel BuildRequires: libusb-devel %endif +# kgamma +%if 0%{?fedora} > 4 || 0%{?rhel} > 4 +BuildRequires: libXxf86vm-devel +%endif +# kuickshow +BuildRequires: imlib-devel +#kfile-plugin +BuildRequires: OpenEXR-devel # kpdf BuildRequires: freetype-devel +%if 0%{?fedora} > 5 || 0%{?rhel} > 4 BuildRequires: poppler-qt-devel -BuildRequires: libXxf86vm-devel - +BuildRequires: libpaper-devel +%endif # ksvg BuildRequires: fontconfig-devel BuildRequires: fribidi-devel BuildRequires: lcms-devel BuildRequires: libart_lgpl-devel BuildRequires: libXmu-devel - # kpovmodeler -%if !%{rhel} -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel +%if 0%{!?rhel:1} +BuildRequires: libGL-devel +BuildRequires: libGLU-devel BuildRequires: libXi-devel %endif -%if %{make_cvs} -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool +%if 0%{?make_cvs} +BuildRequires: automake libtool %endif -Obsoletes: kolourpaint < 0:1.4.3 -Provides: kolourpaint = 0:1.4.3 - %description Graphics applications for the K Desktop Environment, including %{?kamera:* kamera (digital camera support)} @@ -83,30 +85,29 @@ Graphics applications for the K Desktop Environment, including Summary: Development files for kdegraphics Requires: %{name} = %{epoch}:%{version}-%{release} Group: Development/Libraries - %description devel Graphic applications for the K Desktop Environment. This package contains header files for developing applications using kdegraphics. +## FIXME: move more stuff to -extras %package extras Summary: Extras packages from kdegraphics Group: Applications/Multimedia Requires: %{name} = %{epoch}:%{version}-%{release} - %description extras Extra graphics applications for the K Desktop Environment, including: * kfax * kfaxview * kpovmodler + %prep %setup -q %patch1 -p1 -b .misc %patch2 -p1 -b .xorg %patch3 -p1 -b .gcc-warning -%patch4 -p1 -b .kpdf-xft -%if %{rhel} +%if 0%{!?rhel:1} DO_NOT_COMPILE="" export DO_NOT_COMPILE="$DO_NOT_COMPILE kfax" export DO_NOT_COMPILE="$DO_NOT_COMPILE kfaxview" @@ -117,6 +118,7 @@ Extra graphics applications for the K Desktop Environment, including: make -f admin/Makefile.common cvs %endif + %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -124,12 +126,11 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh --enable-new-ldflags \ --disable-dependency-tracking \ --disable-rpath \ - --disable-gcc-hidden-visibility \ -%if %{debug} == 0 +%if "%{?debug}" != "1" --disable-debug \ --disable-warnings \ %endif% -%if %{final} +%if 0%{?final} --enable-final \ %endif --includedir=%{_includedir}/kde \ @@ -167,9 +168,10 @@ for dir in k* ; do if test -s "$dir/$file" ; then install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" # exclude for RHEL - if [ $dir != kfax -a $dir != kfaxview -a $dir != kpovmodeler ] ; then - echo "%doc rpmdocs/$dir/" >> %{name}.lang - fi +%if 0%{!?rhel:1} + [ $dir != kfax -a $dir != kfaxview -a $dir != kpovmodeler ] && \ +%endif + echo "%doc rpmdocs/$dir/" >> %{name}.lang fi done done @@ -193,7 +195,7 @@ for f in crystalsvg hicolor ; do done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -%if !%{rhel} +%if 0%{!?rhel:1} %post extras /sbin/ldconfig ||: for f in crystalsvg hicolor ; do @@ -209,9 +211,8 @@ for f in crystalsvg hicolor ; do gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -%endif -%if !%{rhel} + %files extras %defattr(-,root,root,-) @@ -243,8 +244,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_libdir}/kde3/libkpovmodelerpart.* %{_datadir}/applications/kde/kpovmodeler.desktop %{_datadir}/apps/kpovmodeler/ -%{_datadir}/icons/crystalsvg/??x??/mimetypes/kpovmodeler_doc.png -%{_datadir}/icons/hicolor/??x??/apps/kpovmodeler.png +%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* +%{_datadir}/icons/hicolor/*/apps/kpovmodeler.* %endif %files -f %{name}.lang @@ -252,13 +253,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %doc AUTHORS COPYING README %doc rpmdocs/* -%if !%{rhel} +%if 0%{!?rhel:1} # kfax %exclude %{_bindir}/kfax %exclude %{_datadir}/applications/kde/kfax.desktop %exclude %{_datadir}/apps/kfax/ -%exclude %{_datadir}/icons/hicolor/??x??/apps/kfax.png -%exclude %{_datadir}/icons/hicolor/scalable/apps/kfax.svgz +%exclude %{_datadir}/icons/hicolor/*/apps/kfax.* # kfaxview %exclude %{_bindir}/kfaxview @@ -267,8 +267,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/kde3/kfaxviewpart.* %exclude %{_datadir}/applications/kde/kfaxview.desktop %exclude %{_datadir}/apps/kfaxview/ -%exclude %{_datadir}/icons/hicolor/??x??/apps/kfaxview.png -%exclude %{_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz +%exclude %{_datadir}/icons/hicolor/*/apps/kfaxview.* %exclude %{_datadir}/services/kfaxmultipage.desktop %exclude %{_datadir}/services/kfaxmultipage_tiff.desktop @@ -279,8 +278,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/kde3/libkpovmodelerpart.* %exclude %{_datadir}/applications/kde/kpovmodeler.desktop %exclude %{_datadir}/apps/kpovmodeler/ -%exclude %{_datadir}/icons/crystalsvg/??x??/mimetypes/kpovmodeler_doc.png -%exclude %{_datadir}/icons/hicolor/??x??/apps/kpovmodeler.png +%exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* +%exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.* %endif %{_bindir}/* @@ -304,7 +303,13 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_libdir}/lib*.so %exclude %{_libdir}/libkdeinit_*.so + %changelog +* Fri May 04 2007 Rex Dieter - 7:3.5.6-3 +- integrate former kdegraphics-extras bits (kuickshow, OpenEXR kfile plugin) +- drop unecessary/upstreamed kpdf-xft patch4 (kde bug #123417) +- prune pre-3.0 changelog + * Mon Mar 12 2007 Than Ngo - 7:3.5.6-2.fc7 - cleanup @@ -618,130 +623,3 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : * Wed Mar 27 2002 Bernhard Rosenkraenzer 3.0.0-1 - 3.0.0 final -* Thu Mar 21 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020321.1 -- Add docs for kooka and kuickshow and kfile PostScript plugin - -* Wed Mar 6 2002 Bernhard Rosenkraenzer 3.0.0-0.cvs20020306.1 -- Update -- Rename subpackages -- Don't build kamera on alpha - -* Wed Dec 26 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20011226.1 -- Update -- Reorganize package - -* Thu Jul 26 2001 Bernhard Rosenkraenzer 2.2-0.cvs20010726.1 -- The -devel package has kscan-related files -n only. Since kscan isn't built - on s390/s390x, don't build the devel package there. - -* Tue Jul 24 2001 Bernhard Rosenkraenzer 2.2-0.cvs20010724.1 -- Add more build dependencies (#48970) -- Remove ia64 workarounds, no longer needed -- Update - -* Mon Jul 23 2001 Bernhard Rosenkraenzer 2.2-0.cvs20010723.1 -- Restore -devel package, got lost during the update -- Fix build on s390/s390x -- Update - -* Sun Jul 22 2001 Bernhard Rosenkraenzer 2.2-0.cvs20010722.2 -- Make symlinks relative -- Update - -* Wed Feb 21 2001 Bernhard Rosenkraenzer -- 2.1-respin - -* Tue Feb 20 2001 Bernhard Rosenkraenzer -- 2.1 - -* Fri Feb 16 2001 Than Ngo -- fix to build against glibc - -* Tue Feb 6 2001 Bernhard Rosenkraenzer -- Get rid of libkdefakes.so.0 dependency - -* Mon Jan 22 2001 Bernhard Rosenkraenzer -- Update - -* Mon Jan 1 2001 Bernhard Rosenkraenzer -- Update - -* Wed Dec 20 2000 Bernhard Rosenkraenzer -- Update -- Stop excluding ia64 - -* Wed Nov 15 2000 Bernhard Rosenkraenzer -- Update to HEAD - -* Fri Nov 3 2000 Bernhard Rosenkraenzer -- Update to KDE_2_0_BRANCH - -* Mon Oct 23 2000 Bernhard Rosenkraenzer -- 2.0 final - -* Thu Aug 24 2000 Than Ngo -- update to kdegraphics-1.93 - -* Sun Aug 20 2000 Than Ngo -- add missing kdegraphic2 package - -* Mon Aug 7 2000 Bernhard Rosenkraenzer -- new version - -* Tue Jul 25 2000 Bernhard Rosenkraenzer -- new snapshot -- work around compiler bug by disabling kcoloredit for now, FIXME - -* Fri Jul 21 2000 Bernhard Rosenkraenzer -- new snapshot -- SMPify build - -* Sun Jul 16 2000 Than Ngo -- use gcc 2.96 -- new snapshot -- fix docdir - -* Fri Jun 23 2000 Bernhard Rosenkraenzer -- Add Epoch - for some reason, rpm thinks 1.1.2 > 1.92.20000623. - -* Tue Jun 20 2000 Bernhard Rosenkraenzer -- new snapshot -- ExcludeArch ia64 for now - -* Sat Mar 18 2000 Bernhard Rosenkraenzer -- new snapshot -- move it to /usr, where it belongs - -* Sun Oct 24 1999 Bernhard Rosenkraenzer -- Fix compilation - -* Fri Oct 22 1999 Bernhard Rosenkraenzer -- 2.0 CVS - -* Fri Sep 24 1999 Preston Brown -- mark doc files as such - -* Wed Sep 08 1999 Preston Brown -- upgraded to 1.1.2 release - -* Fri Jun 11 1999 Preston Brown -- snapshot, includes kde 1.1.1 + fixes - -* Mon Apr 19 1999 Preston Brown -- last snapshot before release - -* Mon Apr 12 1999 Preston Brown -- latest stable snapshot - -* Wed Feb 24 1999 Preston Brown -- Injected new description and group. - -* Mon Feb 08 1999 Preston Brown -- upgraded to KDE 1.1 final. - -* Sat Feb 06 1999 Preston Brown -- updates to new libstdc++ and rpm standards. - -* Wed Jan 06 1999 Preston Brown -- re-merged in updates from Duncan Haldane -