rpms/kdegraphics/devel kdegraphics.spec,1.137,1.138

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdegraphics/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308/devel

Modified Files:
	kdegraphics.spec 
Log Message:
* Thu Mar 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-4
- backport patch to support poppler 0.7 from KDE 4.0.3


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- kdegraphics.spec	19 Mar 2008 21:48:39 -0000	1.137
+++ kdegraphics.spec	20 Mar 2008 00:23:00 -0000	1.138
@@ -4,7 +4,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Name:           kdegraphics
 Obsoletes:      kdegraphics4 < %{version}-%{release}
@@ -18,6 +18,11 @@
 Patch0:         kdegraphics-4.0.1-system-libspectre.patch
 # necessary CMakeLists.txt changes missing in the above commit
 Patch1:         kdegraphics-4.0.1-system-libspectre-cmake.patch
+# support for poppler 0.7 backported from the KDE 4.0 branch:
+# http://websvn.kde.org/?view=rev&revision=784724
+# http://websvn.kde.org/?view=rev&revision=784736
+# (Older poppler versions are still supported, so no need to apply this conditionally.)
+Patch2:         kdegraphics-4.0.2-poppler07.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -91,6 +96,8 @@
 %patch1 -p1
 %endif
 
+%patch2 -p1 -b .poppler07
+
 
 %build
 
@@ -166,6 +173,9 @@
 
 
 %changelog
+* Thu Mar 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-4
+- backport patch to support poppler 0.7 from KDE 4.0.3
+
 * Wed Mar 19 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-3
 - respin (poppler)