From 9f0ba6b68aba6d3e9b32cd41a6474d6906284969 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Oct 13 2007 18:52:44 +0000
Subject: - kde-3.5.8

- libs subpkg (more multilib friendly)

---

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 dac7f33..3c4a7cf 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -6,8 +6,8 @@
 Name:    kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch:   7
-Version: 3.5.7
-Release: 4%{?dist}
+Version: 3.5.8
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -18,13 +18,11 @@ 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
 
 Provides: kdegraphics3 = %{version}-%{release}
 
 Requires: ghostscript
-Requires: kdelibs3 >= %{version}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 BuildRequires: gettext
 BuildRequires: kdelibs3-devel >= %{version}
@@ -88,29 +86,38 @@ Graphics applications for the K Desktop Environment, including
 %package devel
 Summary: Development files for %{name} 
 Provides: kdegraphics3-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Group: Development/Libraries
 %description devel
 %{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
 
+%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}.
+
+
 
 %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=""
@@ -298,8 +305,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/config*/*
 %{_datadir}/service*/*
 %{_datadir}/mimelnk/*/*
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/kde3/*
 
@@ -309,8 +314,19 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit_*.so
 
+%files libs
+%defattr(-,root,root,-)
+%exclude %{_libdir}/libkfaximage.la
+%exclude %{_libdir}/libkpovmodeler.la
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
+
 
 %changelog
+* 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)
 
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