rpms/ORBit/devel ORBit.spec,1.8,1.9

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/ORBit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28766

Modified Files:
	ORBit.spec 
Log Message:
- Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
- Buildreq glibc-static for test code in bundled popt library



Index: ORBit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ORBit.spec	23 Feb 2009 22:11:05 -0000	1.8
+++ ORBit.spec	24 Feb 2009 10:02:02 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		24%{?dist}
+Release:		25%{?dist}
 Epoch:			1
 URL:			http://orbit-resource.sourceforge.net/
 Source:			http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 
@@ -12,7 +12,14 @@
 Group:			System Environment/Daemons
 License:		LGPLv2+ and GPLv2+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:		flex, gettext, glib-devel, /usr/include/tcpd.h, pkgconfig, libtool
+BuildRequires:		flex, gettext, glib-devel%{?_isa}, /usr/include/tcpd.h, pkgconfig, libtool
+
+# Test code in built-in popt library is built statically.
+# Using system popt library would be highly likely to introduce regressions in this
+# ancient piece of legacy code.
+%if 0%{?fedora} > 10
+BuildRequires:		glibc-static
+%endif
 
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
@@ -31,8 +38,8 @@
 Summary:	Development libraries, header files and utilities for ORBit
 Group:		Development/Libraries
 Requires:	indent
-Requires:	glib-devel
-Requires:	ORBit = %{epoch}:%{version}-%{release}
+Requires:	glib-devel%{?_isa}
+Requires:	ORBit%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:	pkgconfig
 
 # For ownership of %{_datadir}/aclocal
@@ -124,6 +131,10 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Tue Feb 24 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-25
+- Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
+- Buildreq glibc-static for test code in bundled popt library
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.5.17-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild