- obsolete poppler-qt4-static here; versioned Obsoletes, release 3

[packages/poppler0.61.git] / poppler0.61.spec

diff --git a/poppler0.61.spec b/poppler0.61.spec
index 2161cd17be63b8660721773f1ecabb9af5b51ed1..41b59e794b2a99671b07eaae69b42dfbcf1878a4 100644 (file)
--- a/poppler0.61.spec
+++ b/poppler0.61.spec
@@ -4,7 +4,7 @@ Summary:        PDF rendering library
 Summary(pl.UTF-8):     Biblioteka renderująca PDF
 Name:          poppler0.61
 Version:       0.61.0
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Libraries
 Source0:       https://poppler.freedesktop.org/poppler-%{version}.tar.xz
@@ -15,8 +15,6 @@ BuildRequires:        QtCore-devel >= %{qt4_ver}
 BuildRequires: QtGui-devel >= %{qt4_ver}
 BuildRequires: QtTest-devel >= %{qt4_ver}
 BuildRequires: QtXml-devel >= %{qt4_ver}
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1:1.7
 BuildRequires: cairo-devel >= %{cairo_ver}
 BuildRequires: cmake >= 3.1.0
 BuildRequires: curl-devel
@@ -24,7 +22,6 @@ BuildRequires:        docbook-dtd412-xml
 BuildRequires: fontconfig-devel >= 2.0.0
 BuildRequires: freetype-devel >= 2.0
 BuildRequires: gettext-tools
-BuildRequires: gobject-introspection-devel >= 0.9.12
 BuildRequires: lcms2-devel >= 2
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -62,8 +59,8 @@ Mały pakiet zapewniający wsparcie dla starszych aplikacji które wciąż
 wymagają API Qt4.
 
 %package devel
-Summary:       Poppler header files
-Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Poppler
+Summary:       Poppler 0.61 header files
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Poppler 0.61
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      curl-devel
@@ -73,10 +70,10 @@ Requires:   nss-devel >= 3
 Conflicts:     poppler-devel
 
 %description devel
-Header files for the Poppler library.
+Header files for the Poppler 0.61 library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki Poppler.
+Pliki nagłówkowe biblioteki Poppler 0.61.
 
 %package qt4
 Summary:       Qt4 wrapper for poppler
@@ -89,7 +86,7 @@ Requires:     QtXml >= %{qt4_ver}
 Provides:      poppler-Qt = %{version}-%{release}
 Provides:      poppler-qt4 = %{version}-%{release}
 Obsoletes:     poppler-Qt < 0.24.4-2
-Obsoletes:     poppler-qt
+Obsoletes:     poppler-qt < 0.18.1
 Obsoletes:     poppler-qt4 < 0.61.0
 
 %description qt4
@@ -110,8 +107,9 @@ Requires:   QtXml-devel >= %{qt4_ver}
 Provides:      poppler-Qt-devel = %{version}-%{release}
 Provides:      poppler-qt4-devel = %{version}-%{release}
 Obsoletes:     poppler-Qt-devel < 0.24.4-2
-Obsoletes:     poppler-qt-devel
+Obsoletes:     poppler-qt-devel < 0.18.1
 Obsoletes:     poppler-qt4-devel < 0.61.0
+Obsoletes:     poppler-qt4-static < 0.61.0
 
 %description qt4-devel
 Header files for Qt4 wrapper for poppler.
@@ -172,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/poppler/goo
 %{_includedir}/poppler/splash
 %{_pkgconfigdir}/poppler.pc
-%{?with_cairo:%{_pkgconfigdir}/poppler-cairo.pc}
+%{_pkgconfigdir}/poppler-cairo.pc
 %{_pkgconfigdir}/poppler-splash.pc
 
 %files qt4