From 8b5042d24e748f10875ebfb138479704647f1392 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 28 Oct 2011 11:01:44 -0500 Subject: [PATCH] Update to 0.18.1 pkgconfig-style deps tighten deps with %_isa --- .gitignore | 1 + poppler.spec | 50 ++++++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 6d67c26..989bc9e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /poppler-0.17.0.tar.gz /poppler-0.17.3.tar.gz /poppler-0.18.0.tar.gz +/poppler-0.18.1.tar.gz diff --git a/poppler.spec b/poppler.spec index ed686d9..ae571b7 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,8 +1,8 @@ Summary: PDF rendering library Name: poppler -Version: 0.18.0 -Release: 2%{?dist} +Version: 0.18.1 +Release: 1%{?dist} License: GPLv2 Group: Development/Libraries URL: http://poppler.freedesktop.org/ @@ -15,14 +15,15 @@ Patch1: poppler-0.12.4-annot-appearance.patch Requires: poppler-data >= 0.4.0 BuildRequires: automake libtool -BuildRequires: cairo-devel >= 1.10.0 -BuildRequires: gtk2-devel -BuildRequires: lcms-devel +BuildRequires: gettext-devel BuildRequires: libjpeg-devel BuildRequires: openjpeg-devel >= 1.3-5 -BuildRequires: qt4-devel -BuildRequires: gettext-devel -BuildRequires: gobject-introspection-devel +BuildRequires: pkgconfig(cairo) >= 1.10.0 +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(lcms) +BuildRequires: pkgconfig(QtGui) pkgconfig(QtXml) + %description Poppler, a PDF rendering library, is a fork of the xpdf PDF @@ -31,7 +32,7 @@ viewer developed by Derek Noonburg of Glyph and Cog, LLC. %package devel Summary: Libraries and headers for poppler Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel You should install the poppler-devel package if you would like to @@ -40,7 +41,7 @@ compile applications based on poppler. %package glib Summary: Glib wrapper for poppler Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description glib %{summary}. @@ -48,8 +49,8 @@ Requires: %{name} = %{version}-%{release} %package glib-devel Summary: Development files for glib wrapper Group: Development/Libraries -Requires: %{name}-glib = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-glib%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description glib-devel %{summary}. @@ -58,8 +59,8 @@ Requires: %{name}-devel = %{version}-%{release} %package qt Summary: Qt4 wrapper for poppler Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} +Requires: %{name}%{?_isa} = %{version}-%{release} +%{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}} Obsoletes: poppler-qt4 < 0.16.0-3 Provides: poppler-qt4 = %{version}-%{release} %description qt @@ -68,8 +69,8 @@ Provides: poppler-qt4 = %{version}-%{release} %package qt-devel Summary: Development files for Qt4 wrapper Group: Development/Libraries -Requires: %{name}-qt = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-qt%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} Obsoletes: poppler-qt4-devel < 0.16.0-3 Provides: poppler-qt4-devel = %{version}-%{release} Requires: qt4-devel @@ -80,7 +81,7 @@ Requires: qt4-devel %package cpp Summary: Pure C++ wrapper for poppler Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description cpp %{summary}. @@ -88,8 +89,8 @@ Requires: %{name} = %{version}-%{release} %package cpp-devel Summary: Development files for C++ wrapper Group: Development/Libraries -Requires: %{name}-cpp = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-cpp%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description cpp-devel %{summary}. @@ -97,7 +98,7 @@ Requires: %{name}-devel = %{version}-%{release} %package utils Summary: Command line utilities for converting PDF files Group: Applications/Text -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %if 0%{?fedora} < 11 && 0%{?rhel} < 6 # last seen in fc8 Provides: pdftohtml = 0.36-11 @@ -170,7 +171,7 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la %files %defattr(-,root,root,-) %doc COPYING README -%{_libdir}/libpoppler.so.18* +%{_libdir}/libpoppler.so.19* %files devel %defattr(-,root,root,-) @@ -218,8 +219,13 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la %changelog +* Fri Oct 28 2011 Rex Dieter 0.18.1-1 +- Update to 0.18.1 +- pkgconfig-style deps +- tighten deps with %%_isa + * Fri Sep 30 2011 Marek Kasik - 0.18.0-2 -- Update to 0.18.0 +- rebuild * Fri Sep 30 2011 Marek Kasik - 0.18.0-1 - Update to 0.18.0 diff --git a/sources b/sources index 6500020..4dcb4ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4cd3bf2a0a13fa8eaf00d31368915f77 poppler-0.18.0.tar.gz +d30e883a27423c936ef338ce1d967e2d poppler-0.18.1.tar.gz