X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=poppler.spec;h=27aefb7c975d1d3e6189a5c31ab4b01c0d47002c;hb=89fbe7ee38d7af9456dd0cba00ad7a083568cd41;hp=f0119161de3b8b21aaf5152b2ebbb122c73dad3b;hpb=3ae1ae124bbf472cd8f0b4cd76e02e2f1e21defe;p=packages%2Fpoppler.git

diff --git a/poppler.spec b/poppler.spec
index f011916..27aefb7 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.62.0
-Release:	1.1
+Version:	0.69.0
+Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	https://poppler.freedesktop.org/%{name}-%{version}.tar.xz
-# Source0-md5:	42b801f2defaccb6b6cf1bf783ee1552
+# Source0-md5:	0881d921de62673ab558872dadc2b27b
 Patch0:		%{name}-gtkdocdir.patch
-Patch1:		%{name}-gtkdoc1_27.patch
 URL:		https://poppler.freedesktop.org/
 %{?with_qt5:BuildRequires:	Qt5Core-devel >= %{qt5_ver}}
 %{?with_qt5:BuildRequires:	Qt5Gui-devel >= %{qt5_ver}}
@@ -33,15 +32,16 @@ BuildRequires:	fontconfig-devel >= 2.0.0
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gettext-tools
 %{?with_glib:BuildRequires:	glib2-devel >= 1:2.41}
-BuildRequires:	gobject-introspection-devel >= 0.9.12
+%{?with_glib:BuildRequires:	gobject-introspection-devel >= 0.9.12}
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
 BuildRequires:	lcms2-devel >= 2
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
-BuildRequires:	libstdc++-devel >= 6:4.7
+# -std=c++14
+BuildRequires:	libstdc++-devel >= 6:5.0
 BuildRequires:	libtiff-devel
 BuildRequires:	libxml2-devel >= 2.0
-BuildRequires:	nss-devel >= 3
+BuildRequires:	nss-devel >= 3.19
 BuildRequires:	openjpeg2-devel >= 2
 BuildRequires:	pkgconfig >= 1:0.18
 # wanted cairo backends
@@ -55,12 +55,7 @@ BuildRequires:	which
 BuildRequires:	xz
 BuildRequires:	zlib-devel
 Requires:	openjpeg2 >= 2
-Obsoletes:	poppler-cpp-static
-Obsoletes:	poppler-glib-static
-Obsoletes:	poppler-qt4
-Obsoletes:	poppler-qt4-devel
 Obsoletes:	poppler-qt4-static
-Obsoletes:	poppler-qt5-static
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -79,7 +74,8 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	curl-devel
 Requires:	lcms2-devel >= 2
 Requires:	libstdc++-devel >= 6:4.7
-Requires:	nss-devel >= 3
+Requires:	nss-devel >= 3.19
+Conflicts:	poppler0.61-devel
 
 %description devel
 Header files for the Poppler library.
@@ -139,6 +135,18 @@ Header files for cpp wrapper for poppler.
 %description cpp-devel -l pl.UTF-8
 Pliki nagłówkowe wrappera cpp dla popplera.
 
+%package cpp-static
+Summary:	Static version of cpp wrapper for poppler
+Summary(pl.UTF-8):	Statyczna wersja wrappera cpp dla popplera
+Group:		Development/Libraries
+Requires:	%{name}-cpp-devel = %{version}-%{release}
+
+%description cpp-static
+Static version of cpp wrapper for poppler.
+
+%description cpp-static -l pl.UTF-8
+Statyczna wersja wrappera cpp dla popplera.
+
 %package glib
 Summary:	GLib wrapper for poppler
 Summary(pl.UTF-8):	Wrapper GLib dla popplera
@@ -168,6 +176,17 @@ Header files for GLib wrapper for poppler.
 %description glib-devel -l pl.UTF-8
 Pliki nagłówkowe wrappera GLib dla popplera.
 
+%package glib-static
+Summary:	Static version of GLib wrapper for poppler
+Summary(pl.UTF-8):	Statyczna wersja wrappera GLib dla popplera
+Group:		Development/Libraries
+Requires:	%{name}-glib-devel = %{version}-%{release}
+
+%description glib-static
+Static version of GLib wrapper for poppler.
+
+%description glib-static -l pl.UTF-8
+Statyczna wersja wrappera GLib dla popplera.
 
 %package qt5
 Summary:	Qt5 wrapper for poppler
@@ -198,6 +217,18 @@ Header files for Qt5 wrapper for poppler.
 %description qt5-devel -l pl.UTF-8
 Pliki nagłówkowe wrapper Qt5 dla popplera.
 
+%package qt5-static
+Summary:	Static version of Qt5 wrapper for poppler
+Summary(pl.UTF-8):	Statyczna wersja wrappera Qt5 dla popplera
+Group:		Development/Libraries
+Requires:	%{name}-qt5-devel = %{version}-%{release}
+
+%description qt5-static
+Static version of Qt5 wrapper for poppler.
+
+%description qt5-static -l pl.UTF-8
+Statyczna wersja wrappera Qt5 dla popplera.
+
 %package progs
 Summary:	Set of tools for viewing information and converting PDF files
 Summary(pl.UTF-8):	Zestaw narzędzi do wyświetlania informacji i konwertowania plików PDF
@@ -224,7 +255,6 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
@@ -249,7 +279,7 @@ cd build-static
 	-DBUILD_SHARED_LIBS=OFF \
 	-DENABLE_GTK_TESTS=OFF \
 	-DENABLE_LIBCURL=ON \
-	%{?with_apidocs:-DENABLE_GTK_DOC=ON} \
+	-DENABLE_GTK_DOC=OFF \
 	%{!?with_cairo:-DWITH_CAIRO=OFF} \
 	%{!?with_cpp:-DENABLE_CPP=OFF} \
 	%{!?with_glib:-DENABLE_GLIB=OFF} \
@@ -287,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README*
 %attr(755,root,root) %{_libdir}/libpoppler.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.73
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.80
 
 %files devel
 %defattr(644,root,root,755)
@@ -323,6 +353,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libpoppler-cpp.so
 %{_includedir}/poppler/cpp
 %{_pkgconfigdir}/poppler-cpp.pc
+
+%files cpp-static
+%defattr(644,root,root,755)
+%{_libdir}/libpoppler-cpp.a
 %endif
 
 %if %{with glib}
@@ -338,8 +372,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler-glib.pc
 %{_datadir}/gir-1.0/Poppler-0.18.gir
+
+%files glib-static
+%defattr(644,root,root,755)
+%{_libdir}/libpoppler-glib.a
 %endif
 
+
 %if %{with qt5}
 %files qt5
 %defattr(644,root,root,755)
@@ -351,6 +390,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libpoppler-qt5.so
 %{_includedir}/poppler/qt5
 %{_pkgconfigdir}/poppler-qt5.pc
+
+%files qt5-static
+%defattr(644,root,root,755)
+%{_libdir}/libpoppler-qt5.a
 %endif
 
 %files progs