2003-01-28 Laszlo Peter <
[email protected]>
* libIDL.spec: upgrade to 0.8.3, which has a fix needed for the
Solaris builds
* GConf.spec: Add --libexecdir to configure options so we can
move the libexec stuff to lib on Solaris
* ORBit2.spec: add patch with uninstalled .pc file, autotoolize
* glib2.spec: fix a Solaris specific bug in an autotools macro
* gnome-mime-data.spec: autotoolize to get the fixed macro from glib2
* gnome-vfs-extras.spec: remove non-portable compiler flags
* gnome-vfs.spec: add $ACLOCAL_FLAGS to aclocal
* libbonobo.spec: Solaris/Forte specific fixes.
* libgnome.spec: add $ACLOCAL_FLAGS to aclocal
--- a/ChangeLog Wed Jan 28 05:27:24 2004 +0000
+++ b/ChangeLog Wed Jan 28 05:39:03 2004 +0000
@@ -1,10 +1,35 @@
+2003-01-28 Laszlo Peter <[email protected]>
+
+ * libIDL.spec: upgrade to 0.8.3, which has a fix needed for the
+ Solaris builds
+
+ * GConf.spec: Add --libexecdir to configure options so we can
+ move the libexec stuff to lib on Solaris
+
+ * ORBit2.spec: add patch with uninstalled .pc file, autotoolize
+
+ * glib2.spec: fix a Solaris specific bug in an autotools macro
+
+ * gnome-mime-data.spec: autotoolize to get the fixed macro from glib2
+
+ * gnome-vfs-extras.spec: remove non-portable compiler flags
+
+ * gnome-vfs.spec: add $ACLOCAL_FLAGS to aclocal
+
+ * libbonobo.spec: Solaris/Forte specific fixes.
+
+ * libgnome.spec: add $ACLOCAL_FLAGS to aclocal
+
2003-01-27 Dermot McCluskey <[email protected]>
+
* increment Release numbers for cinnabar_linux build 02
2003-01-26 Dermot McCluskey <[email protected]>
+
* undo invalid edit of patch file xscreensaver-05-*
2004-01-26 Damien Donlon <[email protected]>
+
* Uprevved the nautilus l10n po tarbvall to 0.6
2004-01-16 Matt Keenan <[email protected]>
--- a/GConf.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/GConf.spec Wed Jan 28 05:39:03 2004 +0000
@@ -56,6 +56,7 @@
%build
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
+ --libexecdir=%{_libexecdir} \
--sysconfdir=%{_sysconfdir} \
--disable-gtk-doc
make
--- a/ORBit2.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/ORBit2.spec Wed Jan 28 05:39:03 2004 +0000
@@ -13,6 +13,7 @@
Source3: libORBit-2.3.gz
Source4: libORBitCosNaming-2.3.gz
Patch0: ORBit-01-no-static.diff
+Patch1: ORBit-02-uninstalled_pc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://www.gnome.org/projects/ORBit2
DocDir: %{_defaultdocdir}/doc
@@ -58,8 +59,13 @@
%prep
%setup
%patch0 -p1
+%patch1 -p1
%build
+libtoolize --copy --force
+aclocal -I %{_datadir}/aclocal -I %{_datadir}/aclocal/gnome2-macros
+automake --add-missing --copy
+autoconf
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir}
--- a/glib2.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/glib2.spec Wed Jan 28 05:39:03 2004 +0000
@@ -16,6 +16,7 @@
Source7: libgmodule-2.0.3.gz
Source8: libgobject-2.0.3.gz
Source9: libgthread-2.0.3.gz
+Patch: glib-01-gettext-macro.diff
URL: http://www.gtk.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -48,6 +49,8 @@
%prep
%setup -q -n glib-%{version}
+%patch -p1
+
bzcat %SOURCE1 | tar xvf -
%build
--- a/gnome-mime-data.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/gnome-mime-data.spec Wed Jan 28 05:39:03 2004 +0000
@@ -42,6 +42,10 @@
bzcat %SOURCE1 | tar xvf -
%build
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
+automake -a -c -f
+autoconf
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--mandir=%{_mandir}
--- a/gnome-vfs-extras.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/gnome-vfs-extras.spec Wed Jan 28 05:39:03 2004 +0000
@@ -9,6 +9,7 @@
Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs-extras/0.99/gnome-vfs-extras-%{version}.tar.bz2
Patch0: gnome-vfs-extras-01-network-neighborhood-capitalization.diff
Patch1: gnome-vfs-extras-02-rename-smb-shortcut.diff
+Patch2: gnome-vfs-extras-03-compiler-flags.diff
URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -25,8 +26,10 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
+autoconf
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--- a/gnome-vfs.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/gnome-vfs.spec Wed Jan 28 05:39:03 2004 +0000
@@ -77,7 +77,7 @@
%build
libtoolize --force
-aclocal -I %{_datadir}/aclocal/gnome2-macros -I .
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I .
gtkdocize
autoheader
automake -a -c -f
--- a/libIDL.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/libIDL.spec Wed Jan 28 05:39:03 2004 +0000
@@ -1,8 +1,8 @@
Name: libIDL
License: LGPL
Group: System/Libraries
-Version: 0.8.2
-Release: 14
+Version: 0.8.3
+Release: 1
Distribution: Mercury
Vendor: Sun Microsystems, Inc.
Summary: IDL parsing library
@@ -75,6 +75,9 @@
%{_mandir}/man3/*
%changelog
+* Wed Jan 28 2004 - <[email protected]> 0.8.3-1
+- Upgrade to 0.8.3
+
* Mon Dec 15 2003 - <[email protected]>
- Add back the man pages.
--- a/libbonobo.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/libbonobo.spec Wed Jan 28 05:39:03 2004 +0000
@@ -9,6 +9,8 @@
Source: http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.5/libbonobo-%{version}.tar.bz2
Source1: libbonobo-l10n-po-0.6.tar.bz2
Source2: libbonobo-2.3.gz
+Patch0: libbonobo-01-environ.diff
+Patch1: libbonobo-02-forte.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_prefix}/doc
@@ -54,6 +56,8 @@
%prep
%setup
+%patch0 -p1
+%patch1 -p1
bzcat %SOURCE1 | tar xvf -
%build
--- a/libgnome.spec Wed Jan 28 05:27:24 2004 +0000
+++ b/libgnome.spec Wed Jan 28 05:39:03 2004 +0000
@@ -72,7 +72,7 @@
%build
libtoolize --force
-aclocal -I %{_datadir}/aclocal/gnome2-macros -I .
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros -I .
autoheader
automake -a -c -f
autoconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ORBit-02-uninstalled_pc.diff Wed Jan 28 05:39:03 2004 +0000
@@ -0,0 +1,164 @@
+Index: ORBit2/configure.in
+===================================================================
+RCS file: /cvs/gnome/ORBit2/configure.in,v
+retrieving revision 1.128
+diff -u -r1.128 configure.in
+--- ORBit2/configure.in 16 Jan 2004 14:06:05 -0000 1.128
++++ ORBit2/configure.in 21 Jan 2004 07:37:43 -0000
+@@ -319,8 +319,11 @@
+ Makefile
+ orbit2-config
+ ORBit-2.0.pc
++ORBit-2.0-uninstalled.pc
+ ORBit-CosNaming-2.0.pc
++ORBit-CosNaming-2.0-uninstalled.pc
+ ORBit-imodule-2.0.pc
++ORBit-imodule-2.0-uninstalled.pc
+ ORBit.spec
+ src/Makefile
+ src/idl-compiler/Makefile
+@@ -348,6 +351,7 @@
+ include/orbit/orb-core/Makefile
+ include/orbit/poa/Makefile
+ include/orbit/dynamic/Makefile
++include/ORBitservices/Makefile
+ test/Makefile
+ test/everything/Makefile
+ test/inhibit/Makefile
+Index: ORBit2/include/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/ORBit2/include/Makefile.am,v
+retrieving revision 1.1
+diff -u -r1.1 Makefile.am
+--- ORBit2/include/Makefile.am 23 Aug 2000 20:56:39 -0000 1.1
++++ ORBit2/include/Makefile.am 21 Jan 2004 07:37:43 -0000
+@@ -1 +1 @@
+-SUBDIRS=orbit
++SUBDIRS=orbit ORBitservices
+Index: ORBit2/src/orb/include/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/ORBit2/src/orb/include/Makefile.am,v
+retrieving revision 1.7
+diff -u -r1.7 Makefile.am
+--- ORBit2/src/orb/include/Makefile.am 17 Mar 2003 12:50:27 -0000 1.7
++++ ORBit2/src/orb/include/Makefile.am 21 Jan 2004 07:37:43 -0000
+@@ -1,5 +1,5 @@
+
+ all:
+- (cd $(top_builddir)/include; $(MAKE))
++ (cd $(top_builddir)/include/orbit; $(MAKE))
+
+ check install : all
+Index: ORBit2/src/services/imodule/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/ORBit2/src/services/imodule/Makefile.am,v
+retrieving revision 1.5
+diff -u -r1.5 Makefile.am
+--- ORBit2/src/services/imodule/Makefile.am 30 May 2003 15:55:13 -0000 1.5
++++ ORBit2/src/services/imodule/Makefile.am 21 Jan 2004 07:37:43 -0000
+@@ -17,9 +17,6 @@
+ $(LOCAL_LINC_LIBS) \
+ $(top_builddir)/src/orb/libORBit-2.la
+
+-imoduleincludedir = $(includedir)/orbit-2.0/ORBitservices
+-imoduleinclude_HEADERS = orbit-imodule.h
+-
+ libORBit_imodule_2_la_SOURCES = \
+ orbit-imodule-utils.c \
+ orbit-imodule-utils.h \
+Index: ORBit2/src/services/name/Makefile.am
+===================================================================
+RCS file: /cvs/gnome/ORBit2/src/services/name/Makefile.am,v
+retrieving revision 1.18
+diff -u -r1.18 Makefile.am
+--- ORBit2/src/services/name/Makefile.am 30 May 2003 15:55:17 -0000 1.18
++++ ORBit2/src/services/name/Makefile.am 21 Jan 2004 07:37:43 -0000
+@@ -1,5 +1,3 @@
+-libORBitservicesincludedir = $(includedir)/orbit-2.0/ORBitservices
+-
+ lib_LTLIBRARIES=libORBitCosNaming-2.la
+
+ noinst_PROGRAMS = name-client-2 orbit-name-server-2
+@@ -10,10 +8,6 @@
+ CosNaming-common.c \
+ CosNaming-stubs.c
+
+-libORBitservicesinclude_HEADERS = \
+- CosNaming.h \
+- CosNaming_impl.h
+-
+ libORBitCosNaming_2_la_LDFLAGS = \
+ -version-info $(LT_VERSION) \
+ -no-undefined \
+--- ORBit2/ORBit-2.0-uninstalled.pc.in Wed Jan 21 19:44:07 2004
++++ ORBit2/ORBit-2.0-uninstalled.pc.in Wed Jan 21 16:29:01 2004
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++orbit_idl=${pc_top_builddir}/${pcfiledir}/src/idl-compiler/orbit-idl-2
++
++
++Name: ORBit-2.0
++Description: High-performance CORBA Object Request Broker.
++Version: @ORBIT_VERSION@
++Requires: glib-2.0 gmodule-2.0
++Libs: ${pc_top_builddir}/${pcfiledir}/src/orb/libORBit-2.la @ORBIT_LIBS@ @LIBS@ -lm
++Cflags: -I${pc_top_builddir}/${pcfiledir}/include -DORBIT2=1
+--- ORBit2/ORBit-CosNaming-2.0-uninstalled.pc.in Wed Jan 21 19:44:07 2004
++++ ORBit2/ORBit-CosNaming-2.0-uninstalled.pc.in Wed Jan 21 17:46:03 2004
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++
++Name: ORBit-CosNaming-2.0
++Description: High-performance CORBA Object Request Broker - Naming Service.
++Version: @ORBIT_VERSION@
++Requires: ORBit-2.0
++Libs: ${pc_top_builddir}/${pcfiledir}/src/services/name/libORBitCosNaming-2.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/include
+--- ORBit2/ORBit-imodule-2.0-uninstalled.pc.in Wed Jan 21 19:44:07 2004
++++ ORBit2/ORBit-imodule-2.0-uninstalled.pc.in Wed Jan 21 17:46:16 2004
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++
++Name: ORBit-imodule-2.0
++Description: ORBit runtime typelib generation service.
++Version: @ORBIT_VERSION@
++Requires: ORBit-2.0 libIDL-2.0
++Libs: ${pc_top_builddir}/${pcfiledir}/libORBit-imodule-2.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/include
+--- ORBit2/include/ORBitservices/Makefile.am Wed Jan 21 19:44:07 2004
++++ ORBit2/include/ORBitservices/Makefile.am Wed Jan 21 18:36:20 2004
+@@ -0,0 +1,23 @@
++libORBitservicesincludedir = $(includedir)/orbit-2.0/ORBitservices
++
++libORBitservicesinclude_HEADERS = \
++ CosNaming.h \
++ CosNaming_impl.h
++
++CosNaming.h: $(top_srcdir)/src/services/name/CosNaming.h
++ cmp -s $< $@ || \
++ cp $< $@
++
++CosNaming_impl.h: $(top_srcdir)/src/services/name/CosNaming_impl.h
++ cmp -s $< $@ || \
++ cp $< $@
++
++imoduleincludedir = $(includedir)/orbit-2.0/ORBitservices
++imoduleinclude_HEADERS = orbit-imodule.h
++
++orbit-imodule.h: $(top_srcdir)/src/services/imodule/orbit-imodule.h
++ cmp -s $< $@ || \
++ cp $< $@
++
++BUILT_SOURCES = $(libORBitservicesinclude_HEADERS) $(imoduleinclude_HEADERS)
++CLEANFILES= $(BUILT_SOURCES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/glib-01-gettext-macro.diff Wed Jan 28 05:39:03 2004 +0000
@@ -0,0 +1,12 @@
+--- glib-2.3.1.orig/m4macros/glib-gettext.m4 Fri Jan 23 10:05:24 2004
++++ glib-2.3.1/m4macros/glib-gettext.m4 Fri Jan 23 10:06:27 2004
+@@ -99,7 +99,8 @@
+ #-----------------
+ glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+- [USE_NLS=yes
++ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
++ USE_NLS=yes
+ AC_SUBST(USE_NLS)
+
+ gt_cv_have_gettext=no
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libbonobo-01-environ.diff Wed Jan 28 05:39:03 2004 +0000
@@ -0,0 +1,21 @@
+--- libbonobo/bonobo-activation/bonobo-activation-client.c Mon Dec 8 22:02:23 2003
++++ libbonobo/bonobo-activation/bonobo-activation-client.c Wed Jan 21 09:08:08 2004
+@@ -197,6 +197,8 @@
+ return result;
+ }
+
++extern char **environ;
++
+ void
+ bonobo_activation_register_client (Bonobo_ActivationContext context,
+ CORBA_Environment *ev)
+@@ -217,7 +219,8 @@
+ bonobo_activation_hostname_get ());
+
+ /* send environment to activation server */
+- client_env._buffer = __environ;
++ client_env._buffer = environ;
++
+ if (client_env._buffer) {
+ for (i = 0; client_env._buffer[i]; ++i);
+ client_env._length = i;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libbonobo-02-forte.diff Wed Jan 28 05:39:03 2004 +0000
@@ -0,0 +1,31 @@
+--- libbonobo-2.5.1/bonobo/bonobo-application.c.orig Wed Jan 21 09:31:50 2004
++++ libbonobo-2.5.1/bonobo/bonobo-application.c Wed Jan 21 09:32:31 2004
+@@ -205,7 +205,7 @@
+ return retval;
+ }
+
+-static __inline__ void
++static inline void
+ message_desc_copy (Bonobo_Application_MessageDesc *dest,
+ Bonobo_Application_MessageDesc *src)
+ {
+@@ -372,7 +372,7 @@
+ return app;
+ }
+
+-static __inline__ CORBA_TypeCode
++static inline CORBA_TypeCode
+ _gtype_to_typecode (GType gtype)
+ {
+ static GHashTable *hash = NULL;
+--- libbonobo-2.5.1/bonobo/bonobo-app-client.c.orig Wed Jan 21 09:32:09 2004
++++ libbonobo-2.5.1/bonobo/bonobo-app-client.c Wed Jan 21 09:32:47 2004
+@@ -231,7 +231,7 @@
+ }
+
+
+-static __inline__ GType
++static inline GType
+ _typecode_to_gtype (CORBA_TypeCode tc)
+ {
+ static GHashTable *hash = NULL;