rpms/gnome-libs/devel gnome-libs.spec,1.11,1.12

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22083

Modified Files:
	gnome-libs.spec 
Log Message:
- Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
  (where available)
- BerkeleyDB source moved to download.oracle.com



Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-libs.spec	30 Aug 2008 08:06:16 -0000	1.11
+++ gnome-libs.spec	20 Nov 2008 19:26:30 -0000	1.12
@@ -5,7 +5,7 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        The main GNOME1 libraries
 License:        LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
 Group:          System Environment/Libraries
@@ -15,7 +15,7 @@
 # http://cvs.fedora.redhat.com/viewcvs/devel/gnome-libs/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-libs/1.4/gnome-libs-%{version}.tar.bz2
 Source2:        gnome-libs-pofiles.tar.gz
-Source3:        http://downloads.sleepycat.com/db.1.85.tar.gz
+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
@@ -28,17 +28,17 @@
 Requires:       utempter
 
 BuildRequires:  zlib-devel
-BuildRequires:  imlib-devel
-BuildRequires:  esound-devel
+BuildRequires:  imlib-devel%{?_isa}
+BuildRequires:  esound-devel%{?_isa}
 BuildRequires:  ORBit-devel
-BuildRequires:  glib-devel
+BuildRequires:  glib-devel%{?_isa}
 BuildRequires:  gtk+-devel
 BuildRequires:  /usr/bin/automake-1.4
-BuildRequires:  libpng10-devel >= 1.0.13
+BuildRequires:  libpng10-devel%{?_isa} >= 1.0.13
 BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  libXpm-devel
-BuildRequires:  libXt-devel
+BuildRequires:  libXt-devel%{?_isa}
 BuildRequires:  gtk-doc
 
 # Red Hat patches
@@ -85,18 +85,20 @@
 Summary:        Libraries and headers for GNOME 1 application development
 Group:          Development/Libraries
 License:        LGPLv2+ and (LGPLv2+ and BSD with advertising)
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       gnome-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       glib-devel%{?_isa}
 Requires:       gtk+-devel
 Requires:       ORBit-devel
-Requires:       imlib-devel
-Requires:       esound-devel
-Requires:       libSM-devel
+Requires:       imlib-devel%{?_isa}
+Requires:       esound-devel%{?_isa}
+Requires:       libSM-devel%{?_isa}
 Requires:       pkgconfig
 
 # For ownership of %{_datadir}/aclocal
 Requires:       automake
 
 # Make sure we have the same-arch glib-devel package (#445981)
+# Needed where %{_isa} isn't yet supported
 Requires:       %{_libdir}/pkgconfig/glib.pc
 
 %description devel
@@ -301,6 +303,11 @@
 %{_libdir}/libgnomeui.so
 
 %changelog
+* Wed Nov 20 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-11
+- Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
+  (where available)
+- BerkeleyDB source moved to download.oracle.com
+
 * Fri Aug 29 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-10
 - Use %%patch0 rather than %%patch in %%prep
 - Fix patches to work without fuzz