X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=poppler.spec;h=73f13990b8d55ca28675d8002a99f056225a349d;hb=97ce322a39b3305cf365fb0ff69c4747b9cd10d1;hp=66d5a0b741c3949ccbef8f7d77ecc9363864774f;hpb=356581a69e4a871a808351c070be62e289b39e3d;p=packages%2Fpoppler.git

diff --git a/poppler.spec b/poppler.spec
index 66d5a0b..73f1399 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	apidocs # disable gtk-doc 
+%bcond_without	apidocs # disable gtk-doc
 %bcond_without	cairo	# disable Cairo backend
 %bcond_without	qt	# disable qt wrapper
 %bcond_without	qt4	# disable qt4 wrapper
@@ -10,30 +10,32 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.8.6
-Release:	1
+Version:	0.12.3
+Release:	3
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	6f2f5761ea06074d581951014b646372
+# Source0-md5:	d0ca8344d8d94e27aaba6d432688365d
 URL:		http://poppler.freedesktop.org/
 %{?with_qt4:BuildRequires:	QtGui-devel >= 4.1.0}
-%{?with_qt4:BuildRequires:	QtXml-devel >= 4.1.0}
 %{?with_qt4:BuildRequires:	QtTest-devel >= 4.1.0}
-%{?with_qt4:BuildRequires:	qt4-build}
+%{?with_qt4:BuildRequires:	QtXml-devel >= 4.1.0}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 %{?with_cairo:BuildRequires:	cairo-devel >= %{cairo_ver}}
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 2.0
-BuildRequires:	gtk+2-devel >= 2:2.8.0
+BuildRequires:	glib2-devel >= 1:2.6.0
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libtool >= 2:1.5
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
 %{?with_qt:BuildRequires:	qt-devel >= 3.0}
+%{?with_qt4:BuildRequires:	qt4-build}
+BuildRequires:	which
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -90,7 +92,7 @@ Summary(pl.UTF-8):	Wrapper GLib dla popplera
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 %{?with_cairo:Requires:	cairo >= %{cairo_ver}}
-Requires:	gtk+2 >= 2:2.8.0
+Requires:	glib2 >= 1:2.6.0
 
 %description glib
 GLib wrapper for poppler.
@@ -105,7 +107,7 @@ Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-glib = %{version}-%{release}
 %{?with_cairo:Requires:	cairo-devel >= %{cairo_ver}}
-Requires:	gtk+2-devel >= 2:2.8.0
+Requires:	glib2-devel >= 1:2.6.0
 
 %description glib-devel
 Header files for GLib wrapper for poppler.
@@ -179,8 +181,8 @@ Wrapper Qt4 dla popplera.
 Summary:	Header files for Qt4 wrapper for poppler
 Summary(pl.UTF-8):	Pliki nagłówkowe wrappera Qt4 dla popplera
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-Qt = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 Requires:	QtGui-devel
 Requires:	QtXml-devel
 
@@ -209,8 +211,8 @@ Group:		Applications/Publishing
 Provides:	pdftops
 Obsoletes:	pdftohtml
 Obsoletes:	pdftohtml-pdftops
-Obsoletes:	xpdf-tools
 Obsoletes:	poppler-utils
+Obsoletes:	xpdf-tools
 
 %description progs
 Package contains utilites for PDF files. These utilities allow to
@@ -222,8 +224,8 @@ Package contains utilites for PDF files. These utilities allow to
 Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 - wyświetlanie informacji o plikach PDF
 - wydobywanie obrazków z plików PDF
-- konwersję plików PDF do formatów takich jak HTML, PS czy też czystego
-  tekstu
+- konwersję plików PDF do formatów takich jak HTML, PS czy też
+  czystego tekstu
 
 %prep
 %setup -q
@@ -236,8 +238,9 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 %{__autoheader}
 %{__automake}
 %configure \
-	QTINC=/usr/include/qt \
+	QTINC=%{_includedir}/qt \
 	QTLIB=%{_libdir} \
+	--disable-gtk-test \
 	%{!?with_cairo:--disable-cairo-output} \
 	%{!?with_qt:--disable-poppler-qt} \
 	%{!?with_qt4:--disable-poppler-qt4} \
@@ -245,7 +248,9 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 	%{?with_apidocs:--enable-gtk-doc} \
 	--enable-xpdf-headers \
 	--enable-zlib \
+	--enable-dependency-tracking \
 	--with-html-dir=%{_gtkdocdir}
+
 %{__make}
 
 %install
@@ -254,6 +259,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%if %{without apidocs}
+# why it still installs them, brr
+rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/poppler
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -273,7 +283,7 @@ rm -rf $RPM_BUILD_ROOT
 %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.3
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.5
 
 %files devel
 %defattr(644,root,root,755)
@@ -282,8 +292,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/poppler
 %{_includedir}/poppler/poppler-config.h
 %{_includedir}/poppler/[ABCDEFGJLMNOPSTUX]*.h
-%{_includedir}/poppler/Function.cc
 %{_includedir}/poppler/goo
+%{_includedir}/poppler/fofi
 %{_includedir}/poppler/splash
 %exclude %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler.pc
@@ -303,7 +313,7 @@ rm -rf $RPM_BUILD_ROOT
 %files glib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.3
+%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.4
 
 %files glib-devel
 %defattr(644,root,root,755)