rpms/ORBit/F-8 ORBit-0.5.17-multiarch.patch, NONE, 1.1 ORBit.spec, 1.4, 1.5

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/pkgs/rpms/ORBit/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4157

Modified Files:
	ORBit.spec 
Added Files:
	ORBit-0.5.17-multiarch.patch 
Log Message:
resync with devel

ORBit-0.5.17-multiarch.patch:

--- NEW FILE ORBit-0.5.17-multiarch.patch ---
--- ORBit-0.5.17/libIDL/libIDL-config.in	2007-10-25 15:16:07.000000000 +0100
+++ ORBit-0.5.17/libIDL/libIDL-config.in	2007-10-25 15:17:29.000000000 +0100
@@ -75,7 +75,7 @@
 	all_flags="$all_flags $includes $cflags `glib-config --cflags`"
 fi
 if test "$echo_libs" = "yes"; then
-	all_flags="$all_flags -L at libdir@ -lIDL `glib-config --libs`"
+	all_flags="$all_flags -L`pkg-config --variable=libdir libIDL` -lIDL `glib-config --libs`"
 fi
 
 # Straight out any possible duplicates, but be careful to
--- ORBit-0.5.17/orbit-config.in	2002-06-06 12:07:26.000000000 +0100
+++ ORBit-0.5.17/orbit-config.in	2007-10-25 15:22:35.000000000 +0100
@@ -4,7 +4,7 @@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 includedir=@includedir@/orbit-1.0
-libdir=@libdir@
+libdir=`pkg-config --variable=libdir ORBit`
 
 usage()
 {


Index: ORBit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ORBit/F-8/ORBit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ORBit.spec	19 Apr 2007 21:13:57 -0000	1.4
+++ ORBit.spec	26 Oct 2007 13:50:10 -0000	1.5
@@ -1,17 +1,18 @@
 Summary:		CORBA Object Request Broker for GNOME-1 compatibility
 Name:			ORBit
 Version:		0.5.17
-Release:		21%{?dist}
+Release:		22%{?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 
 Patch0:			ORBit-0.5.17-aligned-access.patch
 Patch1:			ORBit-underquoted.patch
 Patch2:			ORBit-0.5.17-IIOP-weak-symbols.patch
+Patch3:			ORBit-0.5.17-multiarch.patch
 Group:			System Environment/Daemons
-License:		LGPL/GPL
+License:		LGPLv2+ and GPLv2+
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:		flex, gettext, glib-devel, /usr/include/tcpd.h, pkgconfig
+BuildRequires:		flex, gettext, glib-devel, /usr/include/tcpd.h, pkgconfig, libtool
 
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
@@ -32,9 +33,7 @@
 Requires:	indent
 Requires:	glib-devel
 Requires:	ORBit = %{epoch}:%{version}-%{release}
-
-# For ownership of %{_libdir}/pkgconfig
-Requires:       pkgconfig
+Requires:	pkgconfig
 
 # For ownership of %{_datadir}/aclocal
 Requires:	automake
@@ -52,15 +51,16 @@
 %patch0 -p1 -b .aligned
 %patch1 -p1 -b .underquoted
 %patch2 -p1 -b .weak-symbols
+%patch3 -p1 -b .multiarch
 
 %build
 %configure
 # %{?_smp_mflags} removed at release 1:0.5.17-10.2
-%{__make}
+%{__make} LIBTOOL=/usr/bin/libtool
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" LIBTOOL=/usr/bin/libtool install
 
 # remove unpackaged files
 %{__rm} -f %{buildroot}%{_bindir}/ior-decode
@@ -88,10 +88,12 @@
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %doc libIDL/COPYING libIDL/ChangeLog libIDL/AUTHORS
 %doc libIDL/README libIDL/NEWS libIDL/BUGS libIDL/tstidl.c
+# GPLv2+
 %{_bindir}/name-client
-%{_bindir}/orbit-event-server
 %{_bindir}/orbit-name-server
+%{_bindir}/orbit-event-server
 %{_bindir}/orbit-ird
+# LGPLv2+
 %{_libdir}/libIDL-0.6.so.*
 %{_libdir}/libIIOP.so.*
 %{_libdir}/libORBit.so.*
@@ -100,9 +102,11 @@
 
 %files devel
 %defattr(-,root,root,-)
+# GPLv2+
+%{_bindir}/orbit-idl
+# LGPLv2+
 %{_bindir}/libIDL-config
 %{_bindir}/orbit-config
-%{_bindir}/orbit-idl
 %{_includedir}/libIDL-1.0/
 %{_includedir}/orbit-1.0/
 %{_infodir}/libIDL.info.gz
@@ -120,6 +124,12 @@
 %{_datadir}/aclocal/libIDL.m4
 
 %changelog
+* Thu Oct 25 2007 Paul Howarth <paul at city-fan.org> 1:0.5.17-22
+- Fix multiarch conflicts in -config scripts (#342801)
+- Clarify licensing (libs LGPLv2+, binaries GPLv2+)
+- Preserve timestamps for files copied from source into installed package
+- Build and install using system libtool to avoid bogus rpath on 64-bit arches
+
 * Thu Apr 19 2007 Paul Howarth <paul at city-fan.org> 1:0.5.17-21
 - Buildreq pkgconfig, because EL5's glib-devel should require it but doesn't
 - Use file-based build dependency on /usr/include/tcpd.h instead of