rpms/kdegraphics/F-7 .cvsignore, 1.34, 1.35 kdegraphics.spec, 1.106, 1.107 sources, 1.37, 1.38 post-3.5.7-kdegraphics-CVE-2007-3387.diff, 1.1, NONE

Thu Oct 25 03:09:30 UTC 2007

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14390

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	post-3.5.7-kdegraphics-CVE-2007-3387.diff 
Log Message:
sync w/devel, kde-3.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-7/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35

--- .cvsignore	11 Jun 2007 18:50:16 -0000	1.34
+++ .cvsignore	25 Oct 2007 03:08:56 -0000	1.35
@@ -1 +1,2 @@
 kdegraphics-3.5.7.tar.bz2
+kdegraphics-3.5.8.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-7/kdegraphics.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kdegraphics.spec	13 Aug 2007 19:08:02 -0000	1.106
+++ kdegraphics.spec	25 Oct 2007 03:08:56 -0000	1.107
@@ -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 @@
 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 @@
 * 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 @@
   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 @@
 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 @@
 %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 @@
 
 %{_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 <rdieter[AT]fedoraproject.org> = 7:3.5.7-2
+* Tue Oct 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-3
+- -libs: exclude libkpovmodeler
+- -libs conditional (f8+)
+
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-2
+- respin (for openexr-1.6.0)
+- -libs: %%post/%%postun -p /sbin/ldconfig
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-1
+- kde-3.5.8
+- libs subpkg (more multilib friendly)
+
+* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-4
+- respin (for poppler)
+
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-3
+- (Build)Requires: kdelibs3(-devel)
+- Provides: kdegraphics3(-devel)
+
+* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-2
 - CVE-2007-3387 (#251509, #251511)
 - License: GPLv2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-7/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	11 Jun 2007 18:50:16 -0000	1.37
+++ sources	25 Oct 2007 03:08:56 -0000	1.38
@@ -1 +1 @@
-eae753e80c5f8dd304e7fd0dca84ae67  kdegraphics-3.5.7.tar.bz2
+a3a31fc0e5b791ef330dd0627095d90f  kdegraphics-3.5.8.tar.bz2


--- post-3.5.7-kdegraphics-CVE-2007-3387.diff DELETED ---


