From 33336e68cace2a7b12923750951cdb2f7ea2cd22 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Jan 2009 15:46:48 +0000 Subject: [PATCH] - add needed scriptlets - nuke rpaths --- poppler.spec | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/poppler.spec b/poppler.spec index cdccf67..ff1aafb 100644 --- a/poppler.spec +++ b/poppler.spec @@ -3,7 +3,7 @@ Summary: PDF rendering library Name: poppler Version: 0.10.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and Redistributable, no modification permitted # the code is GPLv2 # the charmap data in /usr/share/poppler is redistributable @@ -14,6 +14,7 @@ Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz Patch0: poppler-ObjStream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: automake libtool BuildRequires: gtk2-devel BuildRequires: cairo-devel BuildRequires: qt3-devel @@ -28,7 +29,6 @@ Summary: Libraries and headers for poppler Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig - %description devel You should install the poppler-devel package if you would like to compile applications based on poppler. @@ -37,7 +37,6 @@ compile applications based on poppler. Summary: Glib wrapper for poppler Group: Development/Libraries Requires: %{name} = %{version}-%{release} - %description glib %{summary}. @@ -47,11 +46,9 @@ Group: Development/Libraries Requires: %{name}-glib = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: gtk-doc - %description glib-devel %{summary}. - %package qt Summary: Qt3 wrapper for poppler Group: System Environment/Libraries @@ -85,7 +82,7 @@ Requires: qt4-devel %{summary}. %package utils -Summary: Command line utilities for converting PDF files. +Summary: Command line utilities for converting PDF files Group: Applications/Text Requires: %{name} = %{version}-%{release} Conflicts: xpdf <= 1:3.01-8 @@ -108,6 +105,8 @@ converting PDF files to a number of other formats. %setup -c -q -a1 pushd %{name}-%{version} %patch0 -p0 -b .objstream +# hammer to nuke rpaths, recheck on new releases +autoreconf -i -f popd %build @@ -137,9 +136,27 @@ make -C %{name}-data-%{dataversion} \ rm $RPM_BUILD_ROOT%{_libdir}/lib*.la +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%post glib -p /sbin/ldconfig + +%postun glib -p /sbin/ldconfig + +%post qt -p /sbin/ldconfig + +%postun qt -p /sbin/ldconfig + +%post qt4 -p /sbin/ldconfig + +%postun qt4 -p /sbin/ldconfig + + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc %{name}-%{version}/README @@ -194,7 +211,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_mandir}/man1/* + %changelog +* Tue Jan 20 2009 Rex Dieter - 0.10.3-2 +- add needed scriptlets +- nuke rpaths + * Tue Jan 13 2009 Matthias Clasen - 0.10.3-1 - Update to 0.10.3