diff --git a/poppler.spec b/poppler.spec index deabab6..81e5deb 100644 --- a/poppler.spec +++ b/poppler.spec @@ -4,7 +4,7 @@ Summary: PDF rendering library Name: poppler Version: 0.62.0 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT URL: http://poppler.freedesktop.org/ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz @@ -17,6 +17,7 @@ Patch1: 0001-fix-build-with-gtk-doc-1.27.patch Patch2: 0001-Revert-Remove-the-Qt4-frontend.patch BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo-ft) @@ -157,14 +158,13 @@ export CC="gcc -fPIC" # hack to make the cmake call pass -DENABLE_ZLIB=OFF \ .. unset CC -make %{?_smp_mflags} +%make_build %install -cd build -make install DESTDIR=$RPM_BUILD_ROOT +%make_install -C build %check -make %{?_smp_mflags} test +%make_build test # verify pkg-config sanity/version export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig @@ -176,20 +176,15 @@ test "$(pkg-config --modversion poppler-qt4)" = "%{version}" test "$(pkg-config --modversion poppler-qt5)" = "%{version}" test "$(pkg-config --modversion poppler-splash)" = "%{version}" -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets -%post glib -p /sbin/ldconfig -%postun glib -p /sbin/ldconfig +%ldconfig_scriptlets glib -%post qt -p /sbin/ldconfig -%postun qt -p /sbin/ldconfig +%ldconfig_scriptlets qt -%post qt5 -p /sbin/ldconfig -%postun qt5 -p /sbin/ldconfig +%ldconfig_scriptlets qt5 -%post cpp -p /sbin/ldconfig -%postun cpp -p /sbin/ldconfig +%ldconfig_scriptlets cpp %files %doc README @@ -251,6 +246,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}" %{_mandir}/man1/* %changelog +* Wed Mar 07 2018 Rex Dieter - 0.62.0-2 +- BR: gcc-c++, use %%ldconfig_scriptlets %%make_build %%make_install + * Wed Feb 14 2018 David Tardon - 0.62.0-1 - new upstream release