rpms/ORBit/devel ORBit.spec,1.12,1.13

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/ORBit/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31660/devel

Modified Files:
	ORBit.spec 
Log Message:
* Mon May 10 2010 Paul Howarth <paul at city-fan.org> - 1:0.5.17-29
- manual dependency of devel package on pkgconfig not needed from F-11, EL-6
- %{_datadir}/aclocal included in filesystem package from F-14
- BR: glibc-static for EL-6 onwards



Index: ORBit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ORBit.spec	27 Jul 2009 14:38:00 -0000	1.12
+++ ORBit.spec	9 Jul 2010 19:40:05 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		28%{?dist}
+Release:		29%{?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 
@@ -18,7 +18,7 @@ BuildRequires:		flex, gettext, glib-deve
 # 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
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
 BuildRequires:		glibc-static%{?_isa}
 %endif
 
@@ -41,10 +41,14 @@ Group:		Development/Libraries
 Requires:	indent
 Requires:	glib-devel%{?_isa}
 Requires:	ORBit%{?_isa} = %{epoch}:%{version}-%{release}
+# 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
-
-# For ownership of %{_datadir}/aclocal
-Requires:	automake
+%endif
 
 %description devel
 ORBit is a high-performance CORBA (Common Object Request Broker Architecture)
@@ -137,6 +141,11 @@ with GNOME-1 applications.
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Mon May 10 2010 Paul Howarth <paul at city-fan.org> - 1:0.5.17-29
+- manual dependency of devel package on pkgconfig not needed from F-11, EL-6
+- %%{_datadir}/aclocal included in filesystem package from F-14
+- BR: glibc-static for EL-6 onwards
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.5.17-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild