upgrade to version 2

orbit/orbit.patch

@@ -1,40 +0,0 @@
---- config.h.in.orig	Tue Jul  2 19:30:48 2002
-+++ config.h.in	Tue Jul  2 19:35:53 2002
-@@ -35,8 +35,10 @@
- 
- #undef ORBIT_HAVE_ALLOCA_H
- 
--#ifdef ORBIT_HAVE_ALLOCA_H
-+#if defined(ORBIT_HAVE_ALLOCA_H) 
-+#if ORBIT_HAVE_ALLOCA_H != 0
- #include <alloca.h>
-+#endif
- #endif
- 
- /* Define if you have the `basename' function. */
-
-Index: ORBit.m4
---- ORBit.m4.orig	2002-06-06 13:07:26 +0200
-+++ ORBit.m4	2007-06-11 17:57:33 +0200
-@@ -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
-Index: libIDL.m4.in
---- libIDL/libIDL.m4.in.orig	2002-06-06 13:07:29 +0200
-+++ libIDL/libIDL.m4.in	2007-06-11 17:59:38 +0200
-@@ -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
-

orbit/orbit.spec

@@ -21,9 +21,14 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package version
+%define       V_major   2
+%define       V_minor   14
+%define       V_level   19
+
 #   package information
 Name:         orbit
-Summary:      CORBA Toolkit
+Summary:      CORBA Toolkit (v2)
 URL:          http://orbit-resource.sourceforge.net/
 Vendor:       The GNOME Project
 Packager:     OpenPKG Foundation e.V.
@@ -31,52 +36,62 @@ Distribution: OpenPKG Community
 Class:        PLUS
 Group:        RPC
 License:      GPL
-Version:      0.5.17
-Release:      20080101
+Version:      %{V_major}.%{V_minor}.%{V_level}
+Release:      20120713
 
 #   list of sources
-Source0:      ftp://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-%{version}.tar.gz
-Patch0:       orbit.patch
+Source0:      ftp://ftp.gnome.org/pub/GNOME/sources/ORBit%{V_major}/%{V_major}.%{V_minor}/ORBit%{V_major}-%{version}.tar.gz
 
 #   build information
-BuildPreReq:  OpenPKG, openpkg >= 20100101, make, bison, flex, gcc
+BuildPreReq:  OpenPKG, openpkg >= 20100101, pkgconfig, make, bison, flex, gcc
 PreReq:       OpenPKG, openpkg >= 20100101
-BuildPreReq:  glib, gettext
-PreReq:       glib, gettext
+BuildPreReq:  glib2, libidl >= 0.8.10, linc >= 1.1.0, popt
+PreReq:       glib2, libidl >= 0.8.10, linc >= 1.1.0, popt
 
 %description
     ORBit is a CORBA 2.2-compliant Object Request Broker (ORB) featuring
-    mature C and Perl bindings.
+    mature C and Perl bindings. It supports POA, DII, DSI, TypeCode,
+    Any, IR and IIOP. Optional features including INS and threading
+    are available. ORBit is engineered for the desktop workstation
+    environment, with a focus on performance, low resource usage, and
+    security.
 
 %track
     prog orbit = {
         version   = %{version}
-        url       = ftp://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/
-        regex     = ORBit-(__VER__)\.tar\.gz
+        url       = ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/
+        regex     = (\d+\.\d+(\.\d+)*)\b
+        url       = ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/__NEWVER__/
+        regex     = ORBit2-(__VER__)\.tar\.gz
     }
 
 %prep
-    %setup -q -n ORBit-%{version}
-    %patch -p0
+    %setup -q -n ORBit%{V_major}-%{version}
+    touch *
 
 %build
+    CFLAGS="%{l_cflags -O}"
+    case "%{l_platform -t}" in
+        *-freebsd* ) CFLAGS="$CFLAGS -pthread" ;;
+    esac
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O}" \
-    LIBS="`%{l_prefix}/bin/glib-config --libs gmodule`" \
+    CFLAGS="$CFLAGS" \
+    CPPFLAGS="%{l_cppflags}" \
+    LDFLAGS="%{l_ldflags}" \
     ./configure \
         --prefix=%{l_prefix} \
-        --with-glib-prefix=%{l_prefix} \
         --disable-shared \
         --disable-nls
-    %{l_shtool} subst \
-        -e 's;^\(SUBDIRS.*\)test\(.*\)$;\1 \2;' Makefile
     %{l_make} %{l_mflags}
 
 %install
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/linc-cleanup-sockets
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std}
 
 %files -f files