Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2013-09-02 17:02:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2013-08-01 17:55:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2013-09-02 17:02:47.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 29 23:46:06 UTC 2013 - hrvoje.sen...@gmail.com + +- Adjust spec files so they build correctly Qt5 port, building of + it is still disabled + +------------------------------------------------------------------- poppler.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.agJpNi/_old 2013-09-02 17:02:48.000000000 +0200 +++ /var/tmp/diff_new_pack.agJpNi/_new 2013-09-02 17:02:48.000000000 +0200 @@ -29,6 +29,7 @@ %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 +%define poppler_qt5_soname 1 %define poppler_api 0.18 %define poppler_apipkg 0_18 Url: http://poppler.freedesktop.org/ @@ -44,7 +45,7 @@ BuildRequires: libqt4-devel %endif %if %build_qt5 -BuildRequires: libqt5-devel +BuildRequires: pkgconfig(Qt5Core) %endif %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel @@ -203,7 +204,7 @@ Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} -Requires: libqt5-devel +Requires: pkgconfig(Qt5Core) %description -n libpoppler-qt5-devel Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -238,6 +239,11 @@ %post -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig %endif +%if %build_qt5 + +%post -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%endif + %postun -n libpoppler%{poppler_soname} -p /sbin/ldconfig %postun -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig @@ -251,6 +257,11 @@ %postun -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig %endif +%if %build_qt5 + +%postun -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%endif + %if %build_qt %files -n libpoppler-qt4-%{poppler_qt4_soname} ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.agJpNi/_old 2013-09-02 17:02:48.000000000 +0200 +++ /var/tmp/diff_new_pack.agJpNi/_new 2013-09-02 17:02:48.000000000 +0200 @@ -29,6 +29,7 @@ %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 +%define poppler_qt5_soname 1 %define poppler_api 0.18 %define poppler_apipkg 0_18 Url: http://poppler.freedesktop.org/ @@ -44,7 +45,7 @@ BuildRequires: libqt4-devel %endif %if %build_qt5 -BuildRequires: libqt5-devel +BuildRequires: pkgconfig(Qt5Core) %endif %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel @@ -203,7 +204,7 @@ Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} -Requires: libqt5-devel +Requires: pkgconfig(Qt5Core) %description -n libpoppler-qt5-devel Poppler is a PDF rendering library, forked from the xpdf PDF viewer @@ -238,6 +239,11 @@ %post -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig %endif +%if %build_qt5 + +%post -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%endif + %postun -n libpoppler%{poppler_soname} -p /sbin/ldconfig %postun -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig @@ -251,6 +257,11 @@ %postun -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig %endif +%if %build_qt5 + +%postun -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%endif + %if %build_qt %files -n libpoppler-qt4-%{poppler_qt4_soname} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
