rpms/poppler/FC-6 poppler.spec,1.33,1.34

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/poppler/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26178

Modified Files:
	poppler.spec 
Log Message:
add qt and qt-devel subpackages



Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/FC-6/poppler.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- poppler.spec	1 Oct 2006 21:18:16 -0000	1.33
+++ poppler.spec	9 Dec 2006 03:58:16 -0000	1.34
@@ -3,16 +3,17 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Libraries
-Source0: %{name}-%{version}.tar.gz
-Source1: %{name}-data-%{dataversion}.tar.gz
-
+URL:     http://poppler.freedesktop.org/
+Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
+Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: gtk2-devel
 BuildRequires: cairo-devel
-Requires: gtk2
+BuildRequires: qt-devel
 
 %description
 Poppler, a PDF rendering library, it's a fork of the xpdf PDF
@@ -21,7 +22,8 @@
 %package devel
 Summary: Libraries and headers for poppler
 Group: Development/Libraries
-Requires: %name = %{version}
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 Poppler, a PDF rendering library, it's a fork of the xpdf PDF
@@ -30,10 +32,26 @@
 You should install the poppler-devel package if you would like to
 compile applications based on poppler.
 
+%package qt
+Summary: Qt wrapper for poppler
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description qt
+%{summary}.
+
+%package qt-devel
+Summary: Development files for Qt wrapper
+Group:   Development/Libraries
+Requires: %{name}-qt = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: qt-devel
+%description qt-devel
+%{summary}.
+
 %package utils
 Summary: Command line utilities for converting PDF files.
 Group: Applications/Text
-Requires: %name = %{version}
+Requires: %{name} = %{version}-%{release}
 Conflicts: xpdf <= 1:3.01-8
 # There's an extras package that provides pdftohtml
 Obsoletes: pdftohtml
@@ -49,17 +67,22 @@
 %setup -c -q -a1
 
 %build
-cd %{name}-%{version}
-%configure --enable-cairo-output --disable-splash-output
-make
+( cd  %{name}-%{version}
+%configure \
+  --disable-static \
+  --enable-cairo-output \
+  --enable-poppler-qt
+)
+make %{?_smp_mflags} -C %{name}-%{version}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall -C %{name}-%{version}
+make -C %{name}-%{version} DESTDIR=$RPM_BUILD_ROOT install
 make -C %{name}-data-%{dataversion} \
 	DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} install
 
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %clean
@@ -69,23 +92,42 @@
 %defattr(-,root,root,-)
 %doc %{name}-%{version}/ChangeLog
 %doc %{name}-%{version}/README
-%{_libdir}/lib*.so.*
-%{_datadir}/poppler
+%{_libdir}/libpoppler-glib.so.*
+%{_libdir}/libpoppler.so.*
+%{_datadir}/poppler/
 
 %files devel
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/*
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
-%{_includedir}/poppler
+%dir %{_includedir}/poppler/
+%{_includedir}/poppler/glib/
 %{_datadir}/gtk-doc/html/poppler
 
+%files qt
+%defattr(-,root,root,-)
+%{_libdir}/libpoppler-qt.so.*
+
+%files qt-devel
+%defattr(-,root,root,-)
+%{_libdir}/libpoppler-qt.so
+%{_libdir}/pkgconfig/poppler-qt.pc
+%{_includedir}/poppler/poppler-qt.h
+%{_includedir}/poppler/poppler-link-qt3.h
+%{_includedir}/poppler/poppler-page-transition.h
+
 %files utils
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Fri Dec 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.5.4-3
+- drop hard-wired: Req: gtk2
+- --disable-static
+- enable qt wrapper
+- -devel: Requires: pkgconfig
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 0.5.4-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21