packages: poppler/poppler.spec - let -Qt(4) binding packages Obsolete -qt(3...

[qboosh]

Author: qboosh                       Date: Sun Nov 13 18:28:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- let -Qt(4) binding packages Obsolete -qt(3) binding packages
- BR: libjpeg-devel, libpng-devel, libtiff-devel (+devel deps)
- now there is no gdk option for glib binding

---- Files affected:
packages/poppler:
   poppler.spec (1.141 -> 1.142) 

---- Diffs:

================================================================
Index: packages/poppler/poppler.spec
diff -u packages/poppler/poppler.spec:1.141 packages/poppler/poppler.spec:1.142
--- packages/poppler/poppler.spec:1.141	Sun Nov 13 11:57:46 2011
+++ packages/poppler/poppler.spec	Sun Nov 13 19:28:00 2011
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - qt and Qt packages make file collisions on case insensitive filesystems,
-#   consider adding version suffix to either of the pckages
 #
 # Conditional build:
 %bcond_without	apidocs # disable gtk-doc
@@ -9,7 +6,6 @@
 %bcond_without	qt4	# disable qt4 wrapper
 %bcond_without	cpp	# disable cpp wrapper
 %bcond_without	glib	# disable glib wrapper
-%bcond_without	gdk	# disable gdk support in glib wrapper
 #
 %define		cairo_ver	1.10.0
 #
@@ -37,10 +33,11 @@
 %{?with_glib:BuildRequires:	glib2-devel >= 1:2.18.0}
 BuildRequires:	gobject-introspection-devel >= 0.6.7
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
-%{?with_gdk:BuildRequires:	gtk+2-devel}
 BuildRequires:	lcms-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	openjpeg-devel
@@ -64,11 +61,16 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Poppler
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	curl-devel
 Requires:	fontconfig-devel >= 2.0.0
 Requires:	freetype-devel >= 2.0
 Requires:	lcms-devel
+Requires:	libjpeg-devel
+Requires:	libpng-devel
 Requires:	libstdc++-devel
+Requires:	libtiff-devel
 Requires:	openjpeg-devel
+Requires:	zlib-devel
 
 %description devel
 Header files for the Poppler library.
@@ -159,7 +161,6 @@
 Requires:	%{name}-glib = %{version}-%{release}
 %{?with_cairo:Requires:	cairo-devel >= %{cairo_ver}}
 Requires:	glib2-devel >= 1:2.18.0
-%{?with_gdk:Provides:	poppler-glib-devel(gdk)}
 
 %description glib-devel
 Header files for GLib wrapper for poppler.
@@ -186,6 +187,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	QtGui >= 4.4.0
 Requires:	QtXml >= 4.4.0
+Obsoletes:	poppler-qt
 
 %description Qt
 Qt4 wrapper for poppler.
@@ -201,6 +203,7 @@
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	QtGui-devel >= 4.4.0
 Requires:	QtXml-devel >= 4.4.0
+Obsoletes:	poppler-qt-devel
 
 %description Qt-devel
 Header files for Qt4 wrapper for poppler.
@@ -213,6 +216,7 @@
 Summary(pl.UTF-8):	Statyczna wersja wrappera Qt4 dla popplera
 Group:		Development/Libraries
 Requires:	%{name}-Qt-devel = %{version}-%{release}
+Obsoletes:	poppler-qt-static
 
 %description Qt-static
 Static version of Qt4 wrapper for poppler.
@@ -258,7 +262,6 @@
 	--enable-libcurl \
 	%{?with_apidocs:--enable-gtk-doc} \
 	%{!?with_cairo:--disable-cairo-output} \
-	%{!?with_gdk:--disable-gdk} \
 	%{!?with_cpp:--disable-poppler-cpp} \
 	%{!?with_glib:--disable-poppler-glib} \
 	%{!?with_qt4:--disable-poppler-qt4} \
@@ -391,6 +394,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.142  2011/11/13 18:28:00  qboosh
+- let -Qt(4) binding packages Obsolete -qt(3) binding packages
+- BR: libjpeg-devel, libpng-devel, libtiff-devel (+devel deps)
+- now there is no gdk option for glib binding
+
 Revision 1.141  2011/11/13 10:57:46  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poppler/poppler.spec?r1=1.141&r2=1.142&f=u