[poppler/f20] qt5: ExcludeArch: ppc ppc64 (f20, hopefully temporary)
Rex Dieter
rdieter at fedoraproject.org
Thu Oct 17 18:43:13 UTC 2013
commit 603d69c699cd06226b671c3a5db5208f96a7ab46
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Oct 17 13:43:15 2013 -0500
qt5: ExcludeArch: ppc ppc64 (f20, hopefully temporary)
poppler.spec | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/poppler.spec b/poppler.spec
index a5fc3b1..7bb0c91 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,3 +1,12 @@
+
+# (temporary) hack alert -- rex
+%if 0%{?fedora} == 20
+# http://bugzilla.redhat.com/1005482
+%ifnarch ppc ppc64
+%global qt5 1
+%endif
+%endif
+
Summary: PDF rendering library
Name: poppler
Version: 0.24.2
@@ -17,7 +26,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(QtGui) pkgconfig(QtXml)
+%if 0%{?qt5}
BuildRequires: pkgconfig(Qt5Gui) pkgconfig(Qt5Xml)
+%endif
BuildRequires: pkgconfig(libtiff-4)
@@ -73,7 +84,7 @@ Requires: qt4-devel
%description qt-devel
%{summary}.
-
+%if 0%{?qt5}
%package qt5
Summary: Qt5 wrapper for poppler
Group: System Environment/Libraries
@@ -90,6 +101,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel
%description qt5-devel
%{summary}.
+%endif
%package cpp
@@ -153,7 +165,7 @@ autoreconf -i -f
--enable-libjpeg \
--enable-libopenjpeg \
--enable-poppler-qt4 \
- --enable-poppler-qt5 \
+ %{?qt5:--enable-poppler-qt5} \
--enable-xpdf-headers \
--disable-zlib \
--enable-introspection=yes
@@ -175,7 +187,7 @@ test "$(pkg-config --modversion poppler-cairo)" = "%{version}"
test "$(pkg-config --modversion poppler-cpp)" = "%{version}"
test "$(pkg-config --modversion poppler-glib)" = "%{version}"
test "$(pkg-config --modversion poppler-qt4)" = "%{version}"
-test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
+%{?qt5:test "$(pkg-config --modversion poppler-qt5)" = "%{version}"}
test "$(pkg-config --modversion poppler-splash)" = "%{version}"
@@ -191,9 +203,11 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%postun qt -p /sbin/ldconfig
+%if 0%{?qt5
%post qt5 -p /sbin/ldconfig
%postun qt5 -p /sbin/ldconfig
+%endif
%post cpp -p /sbin/ldconfig
@@ -241,6 +255,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%{_libdir}/pkgconfig/poppler-qt4.pc
%{_includedir}/poppler/qt4/
+%if 0%{?qt5}
%files qt5
%defattr(-,root,root,-)
%{_libdir}/libpoppler-qt5.so.1*
@@ -250,6 +265,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%{_libdir}/libpoppler-qt5.so
%{_libdir}/pkgconfig/poppler-qt5.pc
%{_includedir}/poppler/qt5/
+%endif
%files cpp
%defattr(-,root,root,-)
@@ -272,6 +288,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%changelog
+* Thu Oct 17 2013 Rex Dieter <rdieter at fedoraproject.org> 0.24.2-2
+- -qt5: ExcludeArch: ppc ppc64 (f20, hopefully temporary)
+
* Mon Sep 30 2013 Marek Kasik <mkasik at redhat.com> - 0.24.2-1
- Update to 0.24.2
More information about the scm-commits
mailing list