rpms/imlib/EL-6 imlib.spec,1.17,1.18

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26970

Modified Files:
	imlib.spec 
Log Message:
* Thu Mar  4 2010 Paul Howarth <paul at city-fan.org> 1:1.9.15-13
- drop %{_datadir}/aclocal dependency from devel package from Fedora 14,
  where this directory is part of the filesystem package (#533962)
- drop manual pkgconfig dependency from devel package from Fedora 11, where
  this dependency is auto-detected
- drop some of the %description text no longer appropriate for this legacy
  package
- don't self-obsolete Imlib and imlib-cfgeditor



Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/EL-6/imlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- imlib.spec	25 Jul 2009 03:18:42 -0000	1.17
+++ imlib.spec	10 May 2010 12:16:41 -0000	1.18
@@ -1,7 +1,7 @@
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	12%{?dist}
+Release:	13%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -26,7 +26,7 @@ BuildRequires:	libtiff-devel%{?_isa}
 BuildRequires:	libX11-devel%{?_isa}
 BuildRequires:	libXt-devel%{?_isa}
 BuildRequires:	zlib-devel
-Obsoletes:	imlib-cfgeditor <= %{version}-%{release}, Imlib <= %{version}-%{release}
+Obsoletes:	imlib-cfgeditor < %{version}-%{release}, Imlib < %{version}-%{release}
 Provides:	imlib-cfgeditor = %{version}-%{release}, Imlib = %{version}-%{release}
 
 %description
@@ -39,9 +39,6 @@ The imlib package also contains the imli
 configure the Imlib image loading and rendering library. Imlib_config can be
 used to control how Imlib uses color and handles gamma corrections, etc.
 
-Install imlib if you need an image loading and rendering library for X11R6, or
-if you are installing GNOME. 
-
 %package devel
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
@@ -54,17 +51,20 @@ Requires:	libtiff-devel%{?_isa}
 Requires:	libX11-devel%{?_isa}
 Requires:	libXt-devel%{?_isa}
 Requires:	zlib-devel
+# From Fedora 14, %{_datadir}/aclocal is included in the filesystem package
+%if 0%{?fedora} < 14
 Requires:	%{_datadir}/aclocal
+%endif
+# From Fedora 11, RHEL-6, pkgconfig dependency is auto-detected
+%if 0%{?fedora} < 11 && 0%{?rhel} < 6
 Requires:	pkgconfig
+%endif
 
 %description devel
 The header files, static libraries and documentation needed for
 developing Imlib applications. Imlib is an image loading and
 rendering library for X11R6.
 
-Install the imlib-devel package if you want to develop Imlib
-applications. You will also need to install the imlib package.
-
 %prep
 %setup -q
 %patch1 -p1 -b .sec2
@@ -159,13 +159,22 @@ GX_LIBS=$(/usr/bin/gtk-config --libs | %
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.15-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Mar  4 2010 Paul Howarth <paul at city-fan.org> 1:1.9.15-13
+- drop %%{_datadir}/aclocal dependency from devel package from Fedora 14,
+  where this directory is part of the filesystem package (#533962)
+- drop manual pkgconfig dependency from devel package from Fedora 11, where
+  this dependency is auto-detected
+- drop some of the %%description text no longer appropriate for this legacy
+  package
+- don't self-obsolete Imlib and imlib-cfgeditor
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.9.15-12
+- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Apr  1 2009 Paul Howarth <paul at city-fan.org> 1:1.9.15-11
 - add libXt-devel dependency for -devel package (#478357)
 - use install -p to maintain timestamps where reasonable
-- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+- use an alternative approach to rpath-fixing - hacking the supplied libtool
   rather than trying to use the system one
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.9.15-10