rpms/poppler
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- reduce lib deps in qt/qt4 pkg-config support

Browse Source
This commit is contained in:
Rex Dieter 2009-06-22 20:44:53 +00:00
parent 57fe6069b0
commit a7f5e15e55
2 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
poppler-0.11.0-pkg_config.patch Normal file
View File

@ -0,0 +1,52 @@
diff -up poppler-0.11.0/poppler-qt4.pc.cmake.pkg_config poppler-0.11.0/poppler-qt4.pc.cmake
--- poppler-0.11.0/poppler-qt4.pc.cmake.pkg_config 2008-11-08 13:00:30.000000000 -0600
+++ poppler-0.11.0/poppler-qt4.pc.cmake 2009-06-22 15:34:59.608531558 -0500
@@ -6,7 +6,8 @@ includedir=${prefix}/include
Name: poppler-qt4
Description: Qt4 bindings for poppler
Version: @POPPLER_VERSION@
-Requires: poppler = @POPPLER_VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-qt4
Cflags: -I${includedir}/poppler/qt4
diff -up poppler-0.11.0/poppler-qt4.pc.in.pkg_config poppler-0.11.0/poppler-qt4.pc.in
--- poppler-0.11.0/poppler-qt4.pc.in.pkg_config 2008-11-08 13:00:30.000000000 -0600
+++ poppler-0.11.0/poppler-qt4.pc.in 2009-06-22 15:34:10.322280523 -0500
@@ -6,7 +6,8 @@ includedir=@includedir@
Name: poppler-qt4
Description: Qt4 bindings for poppler
Version: @VERSION@
-Requires: poppler = @VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-qt4
Cflags: -I${includedir}/poppler/qt4
diff -up poppler-0.11.0/poppler-qt.pc.cmake.pkg_config poppler-0.11.0/poppler-qt.pc.cmake
--- poppler-0.11.0/poppler-qt.pc.cmake.pkg_config 2008-11-08 13:00:30.000000000 -0600
+++ poppler-0.11.0/poppler-qt.pc.cmake 2009-06-22 15:34:47.330283449 -0500
@@ -6,7 +6,8 @@ includedir=${prefix}/include
Name: poppler-qt
Description: Qt bindings for poppler
Version: @POPPLER_VERSION@
-Requires: poppler = @POPPLER_VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-qt
Cflags: -I${includedir}/poppler/qt3
diff -up poppler-0.11.0/poppler-qt.pc.in.pkg_config poppler-0.11.0/poppler-qt.pc.in
--- poppler-0.11.0/poppler-qt.pc.in.pkg_config 2008-11-08 13:00:30.000000000 -0600
+++ poppler-0.11.0/poppler-qt.pc.in 2009-06-22 15:33:33.570301915 -0500
@@ -6,7 +6,8 @@ includedir=@includedir@
Name: poppler-qt
Description: Qt bindings for poppler
Version: @VERSION@
-Requires: poppler = @VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-qt
Cflags: -I${includedir}/poppler/qt3

11
poppler.spec
View File

@ -3,7 +3,7 @@
Summary: PDF rendering library
Name: poppler
Version: 0.11.0
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2 and Redistributable, no modification permitted
# the code is GPLv2
# the charmap data in /usr/share/poppler is redistributable
@ -15,6 +15,9 @@ Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
Patch0: poppler-ObjStream.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# reduce lib deps in -qt/-qt4 pkg-config support
Patch50: poppler-0.11.0-pkg_config.patch
BuildRequires: automake libtool
BuildRequires: cairo-devel
BuildRequires: gtk2-devel
@ -109,7 +112,8 @@ converting PDF files to a number of other formats.
%prep
%setup -c -q -a1
pushd %{name}-%{version}
#patch0 -p0 -b .objstream
%patch0 -p0 -b .objstream
%patch50 -p1 -b .pkg_config
# hammer to nuke rpaths, recheck on new releases
autoreconf -i -f
popd
@ -221,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Jun 22 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.11.0-4
- reduce lib deps in qt/qt4 pkg-config support
* Fri Jun 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.11.0-3
- --enable-libopenjpeg, --disable-zlib