X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=poppler.spec;h=e3befca3a93adc20dbb14fdeb63b226617f8e003;hb=d80ed3f3749e5befb391dc6d148618131892aa49;hp=bf64725494e49f92d599b154c795d9000a8001d6;hpb=6f5842afba5709edd10217e92112e0690ddfe563;p=packages%2Fpoppler.git

diff --git a/poppler.spec b/poppler.spec
index bf64725..e3befca 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -11,14 +11,13 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.33.0
+Version:	0.51.0
 Release:	1
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.xz
-# Source0-md5:	69927d1614d6704021c0b0dd0ee6a852
-Patch0:		%{name}-qt5.patch
-URL:		http://poppler.freedesktop.org/
+Source0:	https://poppler.freedesktop.org/%{name}-%{version}.tar.xz
+# Source0-md5:	342452b9dfd16f3c9912eb029fe0d4e2
+URL:		https://poppler.freedesktop.org/
 %{?with_qt5:BuildRequires:	Qt5Core-devel >= 5.0.0}
 %{?with_qt5:BuildRequires:	Qt5Gui-devel >= 5.0.0}
 %{?with_qt5:BuildRequires:	Qt5Test-devel >= 5.0.0}
@@ -36,7 +35,7 @@ BuildRequires:	docbook-dtd412-xml
 BuildRequires:	fontconfig-devel >= 2.0.0
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gettext-tools
-%{?with_glib:BuildRequires:	glib2-devel >= 1:2.18.0}
+%{?with_glib:BuildRequires:	glib2-devel >= 1:2.41}
 BuildRequires:	gobject-introspection-devel >= 0.6.7
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
 BuildRequires:	lcms2-devel >= 2
@@ -46,7 +45,8 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
-BuildRequires:	openjpeg-devel >= 1.5
+BuildRequires:	nss-devel >= 3
+BuildRequires:	openjpeg2-devel >= 2
 BuildRequires:	pkgconfig >= 1:0.18
 # wanted cairo backends
 BuildRequires:	pkgconfig(cairo-pdf) >= %{cairo_ver}
@@ -59,7 +59,7 @@ BuildRequires:	tar >= 1:1.22
 BuildRequires:	which
 BuildRequires:	xz
 BuildRequires:	zlib-devel
-Requires:	openjpeg >= 1.5
+Requires:	openjpeg2 >= 2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -76,15 +76,9 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Poppler
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	curl-devel
-Requires:	fontconfig-devel >= 2.0.0
-Requires:	freetype-devel >= 2.0
 Requires:	lcms2-devel >= 2
-Requires:	libjpeg-devel
-Requires:	libpng-devel
 Requires:	libstdc++-devel
-Requires:	libtiff-devel
-Requires:	openjpeg-devel >= 1.5
-Requires:	zlib-devel
+Requires:	nss-devel >= 3
 
 %description devel
 Header files for the Poppler library.
@@ -162,7 +156,7 @@ Summary(pl.UTF-8):	Wrapper GLib dla popplera
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 %{?with_cairo:Requires:	cairo >= %{cairo_ver}}
-Requires:	glib2 >= 1:2.18.0
+Requires:	glib2 >= 1:2.41
 
 %description glib
 GLib wrapper for poppler.
@@ -177,7 +171,7 @@ Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-glib = %{version}-%{release}
 %{?with_cairo:Requires:	cairo-devel >= %{cairo_ver}}
-Requires:	glib2-devel >= 1:2.18.0
+Requires:	glib2-devel >= 1:2.41
 
 %description glib-devel
 Header files for GLib wrapper for poppler.
@@ -315,7 +309,6 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -325,8 +318,6 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 %{__autoheader}
 %{__automake}
 %configure \
-	MOCQT4=/usr/bin/moc-qt4 \
-	MOCQT5=/usr/bin/moc-qt5 \
 	--disable-gtk-test \
 	--enable-libcurl \
 	%{?with_apidocs:--enable-gtk-doc} \
@@ -351,7 +342,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{without apidocs}
 # why it still installs them, brr
-%{__rm} -rf $RPM_BUILD_ROOT%{_gtkdocdir}/poppler || :
+%{__rm} -rf $RPM_BUILD_ROOT%{_gtkdocdir}/poppler
 %endif
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -378,7 +369,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.52
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.66
 
 %files devel
 %defattr(644,root,root,755)
@@ -475,5 +466,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pdf*
-%{_mandir}/man1/pdf*
+%attr(755,root,root) %{_bindir}/pdfdetach
+%attr(755,root,root) %{_bindir}/pdffonts
+%attr(755,root,root) %{_bindir}/pdfimages
+%attr(755,root,root) %{_bindir}/pdfinfo
+%attr(755,root,root) %{_bindir}/pdfseparate
+%attr(755,root,root) %{_bindir}/pdfsig
+%attr(755,root,root) %{_bindir}/pdftocairo
+%attr(755,root,root) %{_bindir}/pdftohtml
+%attr(755,root,root) %{_bindir}/pdftoppm
+%attr(755,root,root) %{_bindir}/pdftops
+%attr(755,root,root) %{_bindir}/pdftotext
+%attr(755,root,root) %{_bindir}/pdfunite
+%{_mandir}/man1/pdfdetach.1*
+%{_mandir}/man1/pdffonts.1*
+%{_mandir}/man1/pdfimages.1*
+%{_mandir}/man1/pdfinfo.1*
+%{_mandir}/man1/pdfseparate.1*
+%{_mandir}/man1/pdfsig.1*
+%{_mandir}/man1/pdftocairo.1*
+%{_mandir}/man1/pdftohtml.1*
+%{_mandir}/man1/pdftoppm.1*
+%{_mandir}/man1/pdftops.1*
+%{_mandir}/man1/pdftotext.1*
+%{_mandir}/man1/pdfunite.1*