packages: poppler/poppler.spec - up to 0.18.1; qt3 bindings are gone

Sun Nov 13 11:40:31 CET 2011

Author: arekm                        Date: Sun Nov 13 10:40:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.18.1; qt3 bindings are gone

---- Files affected:
packages/poppler:
   poppler.spec (1.138 -> 1.139) 

---- Diffs:

================================================================
Index: packages/poppler/poppler.spec
diff -u packages/poppler/poppler.spec:1.138 packages/poppler/poppler.spec:1.139

--- packages/poppler/poppler.spec:1.138	Sat Sep 17 16:40:10 2011
+++ packages/poppler/poppler.spec	Sun Nov 13 11:40:25 2011
@@ -6,7 +6,6 @@
 # Conditional build:
 %bcond_without	apidocs # disable gtk-doc
 %bcond_without	cairo	# disable Cairo backend
-%bcond_without	qt	# disable qt wrapper
 %bcond_without	qt4	# disable qt4 wrapper
 %bcond_without	cpp	# disable cpp wrapper
 %bcond_without	glib	# disable glib wrapper
@@ -17,12 +16,12 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.16.7
-Release:	2
+Version:	0.18.1
+Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	3afa28e3c8c4f06b0fbca3c91e06394e
+# Source0-md5:	d30e883a27423c936ef338ce1d967e2d
 URL:		http://poppler.freedesktop.org/
 %{?with_qt4:BuildRequires:	QtGui-devel >= 4.4.0}
 %{?with_qt4:BuildRequires:	QtTest-devel >= 4.4.0}
@@ -46,7 +45,6 @@
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	openjpeg-devel
 BuildRequires:	pkgconfig >= 1:0.18
-%{?with_qt:BuildRequires:	qt-devel >= 3.0}
 %{?with_qt4:BuildRequires:	qt4-build}
 BuildRequires:	sed >= 4.0
 BuildRequires:	which
@@ -181,44 +179,6 @@
 %description glib-static -l pl.UTF-8
 Statyczna wersja wrappera GLib dla popplera.
 
-%package qt
-Summary:	Qt wrapper for poppler
-Summary(pl.UTF-8):	Wrapper Qt dla popplera
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description qt
-Qt wrapper for poppler.
-
-%description qt -l pl.UTF-8
-Wrapper Qt dla popplera.
-
-%package qt-devel
-Summary:	Header files for Qt wrapper for poppler
-Summary(pl.UTF-8):	Pliki nagłówkowe wrappera Qt dla popplera
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	%{name}-qt = %{version}-%{release}
-Requires:	qt-devel
-
-%description qt-devel
-Header files for Qt wrapper for poppler.
-
-%description qt-devel -l pl.UTF-8
-Pliki nagłówkowe wrappera Qt dla popplera.
-
-%package qt-static
-Summary:	Static version of Qt wrapper for poppler
-Summary(pl.UTF-8):	Statyczna wersja wrappera Qt dla popplera
-Group:		Development/Libraries
-Requires:	%{name}-qt-devel = %{version}-%{release}
-
-%description qt-static
-Static version of Qt wrapper for poppler.
-
-%description qt-static -l pl.UTF-8
-Statyczna wersja wrappera Qt dla popplera.
-
 %package Qt
 Summary:	Qt4 wrapper for poppler
 Summary(pl.UTF-8):	Wrapper Qt4 dla popplera
@@ -286,9 +246,6 @@
 %prep
 %setup -q
 
-# fix link with Qt 3 libraries
-%{__sed} -i 's,(POPPLER_QT_LIBS),(libqt3_LIBS),' qt/Makefile.am
-
 %build
 %{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
@@ -297,8 +254,6 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	QTINC=%{_includedir}/qt \
-	QTLIB=%{_libdir} \
 	--disable-gtk-test \
 	--enable-libcurl \
 	%{?with_apidocs:--enable-gtk-doc} \
@@ -306,7 +261,6 @@
 	%{!?with_gdk:--disable-gdk} \
 	%{!?with_cpp:--disable-poppler-cpp} \
 	%{!?with_glib:--disable-poppler-glib} \
-	%{!?with_qt:--disable-poppler-qt} \
 	%{!?with_qt4:--disable-poppler-qt4} \
 	--disable-silent-rules \
 	--enable-xpdf-headers \
@@ -341,9 +295,6 @@
 %post	glib -p /sbin/ldconfig
 %postun	glib -p /sbin/ldconfig
 
-%post	qt -p /sbin/ldconfig
-%postun	qt -p /sbin/ldconfig
-
 %post	Qt -p /sbin/ldconfig
 %postun	Qt -p /sbin/ldconfig
 
@@ -351,14 +302,14 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README* TODO
 %attr(755,root,root) %{_libdir}/libpoppler.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.13
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.19
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler.so
 %dir %{_includedir}/poppler
 %{_includedir}/poppler/poppler-config.h
-%{_includedir}/poppler/[ABCDEFGHJLMNOPRSTUX]*.h
+%{_includedir}/poppler/[ABCDEFGHJLMNOPRSTUVX]*.h
 %{_includedir}/poppler/fofi
 %{_includedir}/poppler/goo
 %{_includedir}/poppler/splash
@@ -397,38 +348,21 @@
 %files glib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.6
-%{_libdir}/girepository-1.0/Poppler-0.16.typelib
+%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.8
+%{_libdir}/girepository-1.0/Poppler-0.18.typelib
 
 %files glib-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-glib.so
 %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler-glib.pc
-%{_datadir}/gir-1.0/Poppler-0.16.gir
+%{_datadir}/gir-1.0/Poppler-0.18.gir
 
 %files glib-static
 %defattr(644,root,root,755)
 %{_libdir}/libpoppler-glib.a
 %endif
 
-%if %{with qt}
-%files qt
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpoppler-qt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler-qt.so.3
-
-%files qt-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpoppler-qt.so
-%{_includedir}/poppler/qt3
-%{_pkgconfigdir}/poppler-qt.pc
-
-%files qt-static
-%defattr(644,root,root,755)
-%{_libdir}/libpoppler-qt.a
-%endif
-
 %if %{with qt4}
 %files Qt
 %defattr(644,root,root,755)
@@ -457,6 +391,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139  2011/11/13 10:40:25  arekm
+- up to 0.18.1; qt3 bindings are gone
+
 Revision 1.138  2011/09/17 14:40:10  sls
 - pass --disable-gdk to configure if builded --without gdk
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poppler/poppler.spec?r1=1.138&r2=1.139&f=u

