[ORBit/f14/master] Fix Makefile issue that kills build with make 3.82 (#631204)

[Paul Howarth]

commit 1786768ce783d4e0a4140c473e16066b41b32698
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Sep 7 23:45:41 2010 +0100

    Fix Makefile issue that kills build with make 3.82 (#631204)

 ORBit-0.5.17-make-3.82.patch |   22 ++++++++++++++++++++++
 ORBit.spec                   |    9 +++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/ORBit-0.5.17-make-3.82.patch b/ORBit-0.5.17-make-3.82.patch
new file mode 100644
index 0000000..546e0f1
--- /dev/null
+++ b/ORBit-0.5.17-make-3.82.patch
@@ -0,0 +1,22 @@
+This has been broken for aeons but make 3.82 finally pointed out the problem.
+
+--- ORBit-0.5.17/popt/intl/Makefile.in	1999-09-29 22:12:45.000000000 +0100
++++ ORBit-0.5.17/popt/intl/Makefile.in	2010-09-07 23:29:48.457109170 +0100
+@@ -199,15 +199,8 @@
+ 	cd .. \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+-# The dependency for intlh.inst is different in gettext and all other
+-# packages.  Because we cannot you GNU make features we have to solve
+-# the problem while rewriting Makefile.in.
+- at GT_YES@intlh.inst: intlh.inst.in ../config.status
+- at GT_YES@	cd .. \
+- at GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+- at GT_YES@	  $(SHELL) ./config.status
+- at GT_NO@.PHONY: intlh.inst
+- at GT_NO@intlh.inst:
++.PHONY: intlh.inst
++intlh.inst:
+ 
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/ORBit.spec b/ORBit.spec
index 0a79c94..5f9cb02 100644
--- a/ORBit.spec
+++ b/ORBit.spec
@@ -1,7 +1,7 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		29%{?dist}
+Release:		30%{?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 
@@ -10,6 +10,7 @@ Patch1:			ORBit-underquoted.patch
 Patch2:			ORBit-0.5.17-IIOP-weak-symbols.patch
 Patch3:			ORBit-0.5.17-multiarch.patch
 Patch4:			ORBit-0.5.17-non-weak-symbols.patch
+Patch5:			ORBit-0.5.17-make-3.82.patch
 Group:			System Environment/Daemons
 License:		LGPLv2+ and GPLv2+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +66,7 @@ with GNOME-1 applications.
 %patch2 -p1 -b .iiop-non-weak-symbols
 %patch3 -p1 -b .multiarch
 %patch4 -p1 -b .non-weak-symbols
+%patch5 -p1 -b .make-3.82
 
 %build
 %configure
@@ -141,8 +143,11 @@ with GNOME-1 applications.
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Tue Sep  7 2010 Paul Howarth <paul at city-fan.org> - 1:0.5.17-30
+- Fix Makefile issue that kills build with make 3.82 (#631204)
+
 * 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
+- 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