[poppler/f20] undo ExcludeArch: ppc ppc64 (qt5-qtbase-5.1.1-6+ fixed)
Rex Dieter
rdieter at fedoraproject.org
Fri Oct 18 13:22:30 UTC 2013
commit 4c6401f8fc431e5bb0cf2c215ab46256b64ad647
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Oct 18 08:22:32 2013 -0500
undo ExcludeArch: ppc ppc64 (qt5-qtbase-5.1.1-6+ fixed)
poppler.spec | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/poppler.spec b/poppler.spec
index 1481ef7..63c25b6 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,16 +1,8 @@
-# (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
-Release: 2%{?dist}
+Release: 3%{?dist}
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
Group: Development/Libraries
URL: http://poppler.freedesktop.org/
@@ -26,9 +18,7 @@ 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)
@@ -84,7 +74,6 @@ Requires: qt4-devel
%description qt-devel
%{summary}.
-%if 0%{?qt5}
%package qt5
Summary: Qt5 wrapper for poppler
Group: System Environment/Libraries
@@ -101,7 +90,6 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: qt5-qtbase-devel
%description qt5-devel
%{summary}.
-%endif
%package cpp
@@ -165,7 +153,7 @@ autoreconf -i -f
--enable-libjpeg \
--enable-libopenjpeg \
--enable-poppler-qt4 \
- %{?qt5:--enable-poppler-qt5} \
+ --enable-poppler-qt5 \
--enable-xpdf-headers \
--disable-zlib \
--enable-introspection=yes
@@ -187,7 +175,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}"
-%{?qt5:test "$(pkg-config --modversion poppler-qt5)" = "%{version}"}
+test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
test "$(pkg-config --modversion poppler-splash)" = "%{version}"
@@ -203,11 +191,9 @@ 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
@@ -255,7 +241,6 @@ 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*
@@ -265,7 +250,6 @@ 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,-)
@@ -288,6 +272,9 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%changelog
+* Fri Oct 18 2013 Rex Dieter <rdieter at fedoraproject.org> 0.24.2-3
+- undo ExcludeArch: ppc ppc64 (qt5-qtbase-5.1.1-6+ fixed)
+
* Thu Oct 17 2013 Rex Dieter <rdieter at fedoraproject.org> 0.24.2-2
- -qt5: ExcludeArch: ppc ppc64 (f20, hopefully temporary)
More information about the scm-commits
mailing list