rpms/gnome-libs/devel gnome-libs.spec,1.17,1.18

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18608

Modified Files:
	gnome-libs.spec 
Log Message:
* Mon Jul  5 2010 Paul Howarth <paul at city-fan.org> 1:1.4.2-16
- 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
- EL-6 uses xdg-open rather than htmlview



Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gnome-libs.spec	25 Jul 2009 00:40:45 -0000	1.17
+++ gnome-libs.spec	5 Jul 2010 22:18:48 -0000	1.18
@@ -5,7 +5,7 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        The main GNOME1 libraries
 License:        LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
 Group:          System Environment/Libraries
@@ -18,7 +18,7 @@ Source2:        gnome-libs-pofiles.tar.g
 Source3:        http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Source4:        utf8-ta.po
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} >= 7
+%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
 Requires:       xdg-utils
 %else
 Requires:       htmlview
@@ -95,16 +95,22 @@ Requires:       ORBit-devel%{?_isa}
 Requires:       imlib-devel%{?_isa}
 Requires:       esound-devel%{?_isa}
 Requires:       libSM-devel%{?_isa}
+
+# From Fedora 11, RHEL-6, pkgconfig dependency is auto-detected
+%if 0%{?fedora} < 11 && 0%{?rhel} < 6
 Requires:       pkgconfig
+%endif
 
 # pkg-config knows to use gnome-config when asked about gnomeui
 Provides:       pkgconfig(gnomeui) = %{version}
 
-# For ownership of %{_datadir}/aclocal
-Requires:       automake
+# From Fedora 14, %%{_datadir}/aclocal is included in the filesystem package
+%if 0%{?fedora} < 14
+Requires:       %{_datadir}/aclocal
+%endif
 
 # Make sure we have the same-arch glib-devel package (#445981)
-# Needed where %{_isa} isn't yet supported
+# Needed where %%{_isa} isn't yet supported
 %if "%{?_isa}" == ""
 Requires:       %{_libdir}/pkgconfig/glib.pc
 %endif
@@ -152,7 +158,7 @@ cd -
 %patch101 -p1 -b .dateedit-fix1
 %patch102 -p1 -b .multiarch
 %patch103 -p1 -b .umode_t
-%if 0%{?fedora} >= 7
+%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
 %patch104 -p1 -b .xdg-open
 %endif
 %patch105 -p1 -b .popthelp-format
@@ -321,6 +327,13 @@ export LD_LIBRARY_PATH=${SAVE_LLP}
 %{_libdir}/libgnomeui.so
 
 %changelog
+* Mon Jul  5 2010 Paul Howarth <paul at city-fan.org> 1:1.4.2-16
+- 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
+- EL-6 uses xdg-open rather than htmlview
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.2-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild