diff --git a/.cvsignore b/.cvsignore index baffbe2..51e94d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ kdegraphics-3.5.7.tar.bz2 +kdegraphics-3.5.8.tar.bz2 diff --git a/kdegraphics.spec b/kdegraphics.spec index 3a0112b..d433721 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -3,11 +3,16 @@ %define final 1 %define make_cvs 0 +%if 0%{?fedora} > 7 +# make -libs subpkg +%define libs 1 +%endif + Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 3.5.7 -Release: 2%{?dist} +Version: 3.5.8 +Release: 3%{?dist} License: GPLv2 Group: Applications/Multimedia @@ -18,13 +23,20 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar. Patch1: kdegraphics-3.3.0-misc.patch Patch2: kdegraphics-3.3.1-xorg.patch Patch3: kdegraphics-3.5.1-warning.patch -# http://www.kde.org/info/security/advisory-20070730-1.txt -Patch4: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdegraphics-CVE-2007-3387.diff -Requires: ghostscript ghostscript-fonts +Provides: kdegraphics3 = %{version}-%{release} + +Requires: ghostscript + +%if 0%{?libs} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +%else +Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +%endif BuildRequires: gettext -BuildRequires: kdelibs-devel >= 6:%{version} +BuildRequires: kdelibs3-devel >= %{version} BuildRequires: libmng-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -83,31 +95,41 @@ Graphics applications for the K Desktop Environment, including * kview (image viewer for GIF, JPEG, TIFF, etc.) %package devel -Summary: Development files for kdegraphics -Requires: %{name} = %{epoch}:%{version}-%{release} +Summary: Development files for %{name} +Provides: kdegraphics3-devel = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{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. +%{summary}. ## FIXME: move more stuff to -extras %package extras -Summary: Extras packages from kdegraphics +Summary: Extra applications from %{name} Group: Applications/Multimedia -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} %description extras -Extra graphics applications for the K Desktop Environment, including: +%{summary}, including: * kfax * kfaxview * kpovmodler +%if 0%{?libs} +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: kdelibs3 >= %{version} +# include to be paranoid, installing libs-only is still mostly untested -- Rex +#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%description libs +%{summary}. +%endif + %prep %setup -q %patch1 -p1 -b .misc %patch2 -p1 -b .xorg %patch3 -p1 -b .gcc-warning -%patch4 -p0 -b .CVE-2007-3387 %if 0%{!?rhel:1} DO_NOT_COMPILE="" @@ -178,13 +200,17 @@ for dir in k* ; do done done +# unpackaged files +# omit kpovmodeler-devel files (for now) -- Rex +rm -f %{buildroot}/libkpovmodeler.so + %clean rm -rf %{buildroot} %post -/sbin/ldconfig ||: +%{!?libs:/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 ||: @@ -192,13 +218,20 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun -/sbin/ldconfig ||: +%{!?libs:/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 || : +%if 0%{?libs} +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig +%endif + + %if 0%{!?rhel:1} %post extras /sbin/ldconfig ||: @@ -244,7 +277,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %doc rpmdocs/kpovmodeler/ %doc %{_docdir}/HTML/en/kpovmodeler/ %{_bindir}/kpovmodeler -%{_libdir}/libkpovmodeler.* +%{_libdir}/libkpovmodeler.so.* +%{_libdir}/libkpovmodeler.la %{_libdir}/kde3/libkpovmodelerpart.* %{_datadir}/applications/kde/kpovmodeler.desktop %{_datadir}/apps/kpovmodeler/ @@ -288,28 +322,56 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_bindir}/* %{_datadir}/applications/kde/*.desktop -%dir %{_datadir}/applnk/Graphics %{_datadir}/applnk/Graphics/*kruler.desktop %{_datadir}/apps/* %{_datadir}/icons/crystalsvg/*/*/* %{_datadir}/icons/hicolor/*/*/* -%config %{_datadir}/config*/* +%{_datadir}/config*/* %{_datadir}/service*/* %{_datadir}/mimelnk/*/* -%{_libdir}/lib*.so.* -%{_libdir}/lib*.la %{_libdir}/libkdeinit_*.so %{_libdir}/kde3/* +%if 0%{?libs} +%files libs +%defattr(-,root,root,-) +%exclude %{_libdir}/libkfaximage.la +%exclude %{_libdir}/libkpovmodeler.la +%exclude %{_libdir}/libkpovmodeler.so.* +%endif +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + %files devel %defattr(-,root,root,-) %{_includedir}/kde/* %{_libdir}/lib*.so +#exclude %{_libdir}/libkpovmodeler.so +%exclude %{_libdir}/libkfaximage.so %exclude %{_libdir}/libkdeinit_*.so %changelog -* Mon Aug 13 2007 Rex Dieter = 7:3.5.7-2 +* Tue Oct 16 2007 Rex Dieter - 7:3.5.8-3 +- -libs: exclude libkpovmodeler +- -libs conditional (f8+) + +* Mon Oct 15 2007 Rex Dieter - 7:3.5.8-2 +- respin (for openexr-1.6.0) +- -libs: %%post/%%postun -p /sbin/ldconfig + +* Sat Oct 13 2007 Rex Dieter - 7:3.5.8-1 +- kde-3.5.8 +- libs subpkg (more multilib friendly) + +* Wed Sep 05 2007 Rex Dieter - 7:3.5.7-4 +- respin (for poppler) + +* Mon Aug 20 2007 Rex Dieter - 7:3.5.7-3 +- (Build)Requires: kdelibs3(-devel) +- Provides: kdegraphics3(-devel) + +* Mon Aug 13 2007 Rex Dieter - 7:3.5.7-2 - CVE-2007-3387 (#251509, #251511) - License: GPLv2 diff --git a/post-3.5.7-kdegraphics-CVE-2007-3387.diff b/post-3.5.7-kdegraphics-CVE-2007-3387.diff deleted file mode 100644 index e28add8..0000000 --- a/post-3.5.7-kdegraphics-CVE-2007-3387.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: kpdf/xpdf/xpdf/Stream.cc -=================================================================== ---- kpdf/xpdf/xpdf/Stream.cc (revision 689574) -+++ kpdf/xpdf/xpdf/Stream.cc (working copy) -@@ -411,9 +411,9 @@ StreamPredictor::StreamPredictor(Stream - - nVals = width * nComps; - if (width <= 0 || nComps <= 0 || nBits <= 0 || -- nComps >= INT_MAX / nBits || -- width >= INT_MAX / nComps / nBits || -- nVals * nBits + 7 < 0) { -+ nComps > gfxColorMaxComps || nBits > 16 || -+ width >= INT_MAX / nComps || -+ nVals >= (INT_MAX - 7) / nBits) { - return; - } - pixBytes = (nComps * nBits + 7) >> 3; diff --git a/sources b/sources index 0a5b5d9..06c2723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eae753e80c5f8dd304e7fd0dca84ae67 kdegraphics-3.5.7.tar.bz2 +a3a31fc0e5b791ef330dd0627095d90f kdegraphics-3.5.8.tar.bz2