rpms/ORBit/devel ORBit-0.5.17-aligned-access.patch, NONE, 1.1 ORBit-underquoted.patch, NONE, 1.1 ORBit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Fri Jul 21 12:39:52 UTC 2006

Author: pghmcfc

Update of /cvs/extras/rpms/ORBit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6861/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ORBit-0.5.17-aligned-access.patch ORBit-underquoted.patch 
	ORBit.spec 
Log Message:
auto-import ORBit-0.5.17-18 on branch devel from ORBit-0.5.17-18.src.rpm

ORBit-0.5.17-aligned-access.patch:

--- NEW FILE ORBit-0.5.17-aligned-access.patch ---
--- ORBit-0.5.17/src/orb/allocators.c.alignment	2003-04-01 18:51:46.000000000 -0500
+++ ORBit-0.5.17/src/orb/allocators.c	2003-04-02 05:28:36.000000000 -0500
@@ -185,9 +185,11 @@
 	case CORBA_tk_except:
 	case CORBA_tk_struct:
 		mem = ALIGN_ADDRESS (mem, ORBit_find_alignment (tc));
-		for (i = 0; i < tc->sub_parts; i++)
+		for (i = 0; i < tc->sub_parts; i++) {
+			mem = ALIGN_ADDRESS (mem, ORBit_find_alignment (tc->subtypes[i]));
 			mem = ORBit_free_via_TypeCode (
 				mem, &tc->subtypes[i], CORBA_TRUE);
+		}
 		retval = mem;
 		break;
 	case CORBA_tk_union: {
--- ORBit-0.5.17/src/orb/corba_any.c.alignment	2002-06-06 07:07:39.000000000 -0400
+++ ORBit-0.5.17/src/orb/corba_any.c	2003-04-02 06:35:53.000000000 -0500
@@ -169,6 +169,7 @@
     case CORBA_tk_struct:
 	*val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc));
 	for(i = 0; i < tc->sub_parts; i++) {
+	    *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc->subtypes[i]));
 	    ORBit_marshal_value(buf, val, tc->subtypes[i], mi);
 	}
 	break;
@@ -197,9 +198,10 @@
 	}
 	break;
     case CORBA_tk_wstring:
+	*val = ALIGN_ADDRESS(*val, ALIGNOF_CORBA_POINTER);
+
 	ulval = strlen(*(char **)*val) + 1;
 
-	*val = ALIGN_ADDRESS(*val, ALIGNOF_CORBA_POINTER);
 	giop_send_buffer_append_mem_indirect_a(buf,
 					       &ulval,
 					       sizeof(CORBA_unsigned_long));
@@ -208,10 +210,10 @@
 	*val = ((guchar *)*val) + sizeof(char *);
 	break;
     case CORBA_tk_string:
-	ulval = strlen(*(char **)*val) + 1;
-	
 	*val = ALIGN_ADDRESS(*val, ALIGNOF_CORBA_POINTER);
 
+	ulval = strlen(*(char **)*val) + 1;
+	
 	giop_send_buffer_append_mem_indirect_a(buf,
 					       &ulval,
 					       sizeof(CORBA_unsigned_long));
@@ -595,6 +597,7 @@
     case CORBA_tk_struct:
 	*val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc));
 	for(i = 0; i < tc->sub_parts; i++) {
+	    *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc->subtypes[i]));
 	    ORBit_demarshal_value(buf, val, tc->subtypes[i], dup_strings, orb);
 	}
 	break;
@@ -820,6 +823,8 @@
 	*val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc));
 	*newval = ALIGN_ADDRESS(*newval, ORBit_find_alignment(tc));
 	for(i = 0; i < tc->sub_parts; i++) {
+	    *val = ALIGN_ADDRESS(*val, ORBit_find_alignment(tc->subtypes[i]));
+	    *newval = ALIGN_ADDRESS(*newval, ORBit_find_alignment(tc->subtypes[i]));
 	    _ORBit_copy_value(val, newval, tc->subtypes[i]);
 	}
 	break;
--- ORBit-0.5.17/src/orb/orbit.c.alignment	2003-04-01 19:02:40.000000000 -0500
+++ ORBit-0.5.17/src/orb/orbit.c	2003-04-02 06:33:28.000000000 -0500
@@ -230,9 +230,12 @@
 		*a = ALIGN_ADDRESS (*a, ORBit_find_alignment (tc));
 		*b = ALIGN_ADDRESS (*b, ORBit_find_alignment (tc));
 
-		for (i = 0; i < tc->sub_parts; i++)
+		for (i = 0; i < tc->sub_parts; i++) {
+			*a = ALIGN_ADDRESS (*a, ORBit_find_alignment (tc->subtypes[i]));
+			*b = ALIGN_ADDRESS (*b, ORBit_find_alignment (tc->subtypes[i]));
 			if (!ORBit_value_equivalent (a, b, tc->subtypes [i], ev))
 				return FALSE;
+		}
 
 		return TRUE;
 	}

ORBit-underquoted.patch:

--- NEW FILE ORBit-underquoted.patch ---
--- ORBit-0.5.17/ORBit.m4.underquoted	2004-07-15 13:20:02.838649043 +0100
+++ ORBit-0.5.17/ORBit.m4	2004-07-15 13:20:09.680340008 +0100
@@ -1,7 +1,7 @@
 dnl AM_PATH_ORBIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for ORBit, and define ORBIT_CFLAGS and ORBIT_LIBS
 dnl
-AC_DEFUN(AM_PATH_ORBIT,
+AC_DEFUN([AM_PATH_ORBIT],
 [dnl 
 dnl Get the cflags and libraries from the orbit-config script
 dnl
--- ORBit-0.5.17/libIDL/libIDL.m4.in.underquoted	2004-08-06 14:28:24.538931501 +0100
+++ ORBit-0.5.17/libIDL/libIDL.m4.in	2004-08-06 14:28:46.528730050 +0100
@@ -3,7 +3,7 @@
 dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
 dnl
-AC_DEFUN(AM_PATH_LIBIDL,
+AC_DEFUN([AM_PATH_LIBIDL],
 [dnl 
 dnl Get the cflags and libraries from the libIDL-config script
 dnl


--- NEW FILE ORBit.spec ---
Summary:		CORBA Object Request Broker for GNOME-1 compatibility
Name:			ORBit
Version:		0.5.17
Release:		18%{?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
Group:			System Environment/Daemons
License:		LGPL/GPL
BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:		flex, gettext, glib-devel, tcp_wrappers

Requires(post):		/sbin/install-info
Requires(preun):	/sbin/install-info

%description
ORBit is a high-performance CORBA (Common Object Request Broker Architecture)
ORB (object request broker). It allows programs to send requests and receive
replies from other programs, regardless of the locations of the two programs.
CORBA is an architecture that enables communication between program objects,
regardless of the programming language they are written in or the operating
system they run on.

This package is provided for compatibility with GNOME-1 applications.

%package devel
Summary:	Development libraries, header files and utilities for ORBit
Group:		Development/Libraries
Requires:	indent
Requires:	glib-devel
Requires:	ORBit = %{epoch}:%{version}-%{release}

# For ownership of %{_libdir}/pkgconfig
Requires:       pkgconfig

# For ownership of %{_datadir}/aclocal
Requires:	automake

%description devel
ORBit is a high-performance CORBA (Common Object Request Broker Architecture)
ORB (object request broker) with support for the C language.

This package contains the header files, libraries, and utilities necessary to
build programs that use the ORBit library. It is provided for compatibility
with GNOME-1 applications.

%prep
%setup -q
%patch0 -p1 -b .aligned
%patch1 -p1 -b .underquoted

%build
%configure
# %{?_smp_mflags} removed at release 1:0.5.17-10.2
%{__make}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

# remove unpackaged files
%{__rm} -f %{buildroot}%{_bindir}/ior-decode
%{__rm} -f %{buildroot}%{_bindir}/old-name-server
%{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_libdir}/lib{IDL,IIOP,ORBit,ORBitCosNaming,ORBitutil}.a
%{__rm} -f %{buildroot}%{_datadir}/idl/orbit-1.0/*
%{__rm} -f %{buildroot}%{_datadir}/info/dir

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/libIDL.info.gz %{_infodir}/dir

%preun devel
[ $1 = 0 ] && /sbin/install-info --delete %{_infodir}/libIDL.info.gz %{_infodir}/dir

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,755)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%doc libIDL/COPYING libIDL/ChangeLog libIDL/AUTHORS
%doc libIDL/README libIDL/NEWS libIDL/BUGS libIDL/tstidl.c
%{_bindir}/name-client
%{_bindir}/orbit-event-server
%{_bindir}/orbit-name-server
%{_bindir}/orbit-ird
%{_libdir}/libIDL-0.6.so.*
%{_libdir}/libIIOP.so.*
%{_libdir}/libORBit.so.*
%{_libdir}/libORBitCosNaming.so.*
%{_libdir}/libORBitutil.so.*

%files devel
%defattr(-,root,root,755)
%{_bindir}/libIDL-config
%{_bindir}/orbit-config
%{_bindir}/orbit-idl
%{_includedir}/libIDL-1.0/
%{_includedir}/orbit-1.0/
%{_infodir}/libIDL.info.gz
%{_libdir}/libIDL.so
%{_libdir}/libIDLConf.sh
%{_libdir}/libIIOP.so
%{_libdir}/libORBit.so
%{_libdir}/libORBitCosNaming.so
%{_libdir}/libORBitutil.so
%{_libdir}/libname-server.a
%{_libdir}/liborbit-c-backend.a
%{_libdir}/pkgconfig/ORBit.pc
%{_libdir}/pkgconfig/libIDL.pc
%{_datadir}/aclocal/ORBit.m4
%{_datadir}/aclocal/libIDL.m4

%changelog
* Mon Jul 10 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-18
- Add automake and pkgconfig as deps of devel subpackage (#198246)

* Fri Jul  7 2006 Paul Howarth <paul at city-fan.org> 1:0.5.17-17
- Change summary to indicate that this package is for GNOME-1 compatibility
- Add %%{?dist} tag
- Use Fedora Extras standard buildroot
- Replace PreReq: /sbin/install-info with proper scriptlet dependencies
- Change URL to something that's not 404
- Wrap package descriptions at 80 columns and add notes about the package being
  provided for GNOME-1 compatibility
- Don't use deprecated %%makeinstall macro
- Don't include libIDL/README.win32
- Use fewer globs in the %%files list for this legacy package
- Separate off libIDL docs into their own directory
- Include release number in fully-versioned dependency from devel to main pkg
- Add buildreqs flex and gettext
- Reinstate static libraries that have no dynamic equivalent
- Minor cosmetic changes to spec file

* Mon Mar 20 2006 Matthias Clasen <mclasen at redhat.com> - 1:0.5.17-16
- Fix source URL
- Don't ship static libraries

* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5.17-15.2.2
- rebump for build order issues during double-long bump

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5.17-15.2.1
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5.17-15.2
- rebuilt for new gcc4.1 snapshot and glibc changes

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Wed Mar  2 2005 Mark McLoughlin <markmc at redhat.com> 1:0.5.17-15
- Rebuild with gcc4

* Fri Aug  6 2004 Tim Waugh <twaugh at redhat.com> 1:0.5.17-14
- Fixed another m4 warning.

* Thu Jul 15 2004 Tim Waugh <twaugh at redhat.com> 1:0.5.17-13
- Fixed warnings in shipped m4 file.

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Mon Jun 23 2003 Havoc Pennington <hp at redhat.com> 1:0.5.17-10.4
- rebuild

* Mon Jun  9 2003 Havoc Pennington <hp at redhat.com> 1:0.5.17-10.2
- try removing smp_mflags

* Fri Jun  6 2003 Tim Powers <timp at redhat.com> 1:0.5.17-10.1
- build for RHEL

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Jun  4 2003 Havoc Pennington <hp at redhat.com> 1:0.5.17-9
- a rebuild, to see if it rebuilds

* Tue Jun  3 2003 Jeff Johnson <jbj at redhat.com>
- add explicit epoch's where needed.

* Wed Apr  2 2003 Matt Wilson <msw at redhat.com> 1:0.5.17-8
- added ORBit-0.5.17-aligned-access.patch to fix accesses on some
  non-ia32 architectures (#86347)

* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Sun Feb 23 2003 Tim Powers <timp at redhat.com> 1:0.5.17-6
- add buildprereq on tcp_wrappers

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Sun Dec 01 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- mainframe builds with normal optims again for mainframe

* Thu Nov 21 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- set optflags to "-O0" for mainframe

* Sat Oct 19 2002 Jeremy Katz <katzj at redhat.com>
- update to 0.5.17
- fix to include all files in the build root

* Tue May 28 2002 Havoc Pennington <hp at redhat.com>
- rebuild to see if gcc still doesn't work

* Thu May 16 2002 Alex Larsson <alexl at redhat.com>
- Rebuild

* Wed Feb 27 2002 Havoc Pennington <hp at redhat.com>
- change invocation of auto* such that it will kill the build if it fails
- comment out invocation of auto*, it seems to be pointless

* Wed Feb 27 2002 Havoc Pennington <hp at redhat.com>
- backport to Hampton
- don't invoke autoheader, seems to cause confusion
- don't run strip manually, let RPM deal with it

* Fri Feb  8 2002 Havoc Pennington <hp at redhat.com>
- 0.5.13

* Fri Jan 18 2002 Havoc Pennington <hp at redhat.com>
- fix for automake14

* Tue Nov  6 2001 Jeremy Katz <katzj at redhat.com>
- 0.5.12

* Thu Oct  4 2001 Havoc Pennington <hp at redhat.com>
- 0.5.10

* Fri Sep 21 2001 Havoc Pennington <hp at redhat.com>
- new CVS snap

* Wed Sep 12 2001 Havoc Pennington <hp at redhat.com>
- update to CVS snapshot with headers moved

* Fri Aug 11 2000 Jonathan Blandford <jrb at redhat.com>
- Up Epoch and release

* Tue Jul 25 2000 Elliot Lee <sopwith at redhat.com>
- 0.5.3

* Wed Jul 19 2000 Jonathan Blandford <jrb at redhat.com>
- fixed to work with new cpp.

* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Tue Jul 11 2000 Jonathan Blandford <jrb at redhat.com>
- Upgraded to 0.5.2 - a bug fix release.

* Tue Jun 27 2000 Havoc Pennington <hp at redhat.com>
- Trying to build the package for Preston and the build
  system wants a new changelog entry

* Sat Jun 24 2000 Preston Brown <pbrown at redhat.com>
- defattr the devel pkg
- FHS paths

* Fri May 19 2000 Jonathan Blandford <jrb at redhat.com>
- Upgraded to 0.5.1

* Tue Feb  3 2000 Elliot Lee <sopwith at redhat.com> 0.5.0-3
- Strip shared libraries

* Mon Aug 30 1999 Elliot Lee <sopwith at redhat.com> 0.4.94-1
- Spec file fixes from RHL 6.0.

* Wed Jun 2 1999  Jose Mercado <jmercado at mit.edu>
- Fixed configure.in so spec.in could be used.

* Mon Nov 23 1998 Pablo Saratxaga <srtxg at chanae.alphanet.ch>

- improved %%files section, and added use of %%{prefix} and install-info
  (well,... no. The info file has not dir info inside, commented out)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ORBit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jul 2006 12:38:33 -0000	1.1
+++ .cvsignore	21 Jul 2006 12:39:51 -0000	1.2
@@ -0,0 +1 @@
+ORBit-0.5.17.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ORBit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jul 2006 12:38:33 -0000	1.1
+++ sources	21 Jul 2006 12:39:51 -0000	1.2
@@ -0,0 +1 @@
+35acc6f8d49d930b566104fcceb893d3  ORBit-0.5.17.tar.bz2


