From 79e247095e7b56a91b99e0f8606d27bfa3f1f4eb Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Tue, 18 Jan 2011 15:12:13 -0600
Subject: [PATCH] - drop qt3 bindings - rename -qt4 -> -qt

---
 poppler.spec | 56 +++++++++++++++-------------------------------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/poppler.spec b/poppler.spec
index 8967cca..92723ea 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.16.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -22,7 +22,6 @@ BuildRequires: gtk2-devel
 BuildRequires: lcms-devel
 BuildRequires: libjpeg-devel
 BuildRequires: openjpeg-devel >= 1.3-5
-BuildRequires: qt3-devel
 BuildRequires: qt4-devel
 BuildRequires: gettext-devel
 BuildRequires: gobject-introspection-devel
@@ -59,41 +58,28 @@ Requires: %{name}-devel = %{version}-%{release}
 %description glib-devel
 %{summary}.
 
+
 %package qt
-Summary: Qt3 wrapper for poppler
+Summary: Qt4 wrapper for poppler
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+Obsoletes: poppler-qt4 < 0.16.0-3
+Provides:  poppler-qt4 = %{version}-%{release}
 %description qt
 %{summary}.
 
 %package qt-devel
-Summary: Development files for Qt3 wrapper
+Summary: Development files for Qt4 wrapper
 Group:   Development/Libraries
 Requires: %{name}-qt = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
-Requires: qt3-devel
-
+Obsoletes: poppler-qt4-devel < 0.16.0-3
+Provides:  poppler-qt4-devel = %{version}-%{release}
+Requires: qt4-devel
 %description qt-devel
 %{summary}.
 
-%package qt4
-Summary: Qt4 wrapper for poppler
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description qt4
-%{summary}.
-
-%package qt4-devel
-Summary: Development files for Qt4 wrapper
-Group:   Development/Libraries
-Requires: %{name}-qt4 = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
-Requires: qt4-devel
-
-%description qt4-devel
-%{summary}.
 
 %package cpp
 Summary: Pure C++ wrapper for poppler
@@ -153,7 +139,7 @@ autoreconf -i -f
   --enable-cairo-output \
   --enable-libjpeg \
   --enable-libopenjpeg \
-  --enable-poppler-qt \
+  --disable-poppler-qt \
   --enable-poppler-qt4 \
   --enable-xpdf-headers \
   --disable-zlib \
@@ -180,10 +166,6 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %postun qt -p /sbin/ldconfig
 
-%post qt4 -p /sbin/ldconfig
-
-%postun qt4 -p /sbin/ldconfig
-
 %post cpp -p /sbin/ldconfig
 
 %postun cpp -p /sbin/ldconfig
@@ -216,19 +198,9 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %files qt
 %defattr(-,root,root,-)
-%{_libdir}/libpoppler-qt.so.3*
-
-%files qt-devel
-%defattr(-,root,root,-)
-%{_libdir}/libpoppler-qt.so
-%{_libdir}/pkgconfig/poppler-qt.pc
-%{_includedir}/poppler/qt3/
-
-%files qt4
-%defattr(-,root,root,-)
 %{_libdir}/libpoppler-qt4.so.3*
 
-%files qt4-devel
+%files qt-devel
 %defattr(-,root,root,-)
 %{_libdir}/libpoppler-qt4.so
 %{_libdir}/pkgconfig/poppler-qt4.pc
@@ -250,6 +222,10 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %changelog
+* Tue Jan 18 2011 Rex Dieter <rdieter@fedoraproject.org> - 0.16.0-3
+- drop qt3 bindings
+- rename -qt4 -> -qt
+
 * Wed Jan 12 2011 Rex Dieter <rdieter@fedoraproject.org> - 0.16.0-2
 - rebuild (openjpeg)