--- a/ChangeLog	Mon Oct 06 13:00:08 2003 +0000
+++ b/ChangeLog	Mon Oct 06 14:01:23 2003 +0000
@@ -1,3 +1,9 @@
+2003-10-06  Mark McLoughlin  <[email protected]>
+
+	* ORBit2.spec: update to 2.8.1.
+
+	* linc.spec: remove. Has been swallowed up by ORBit2.
+
 2003-10-06 Erwann Chenede - <[email protected]>
 
 	 * gtk2.spec : updated from 2.2.2 to 2.2.4

--- a/ORBit2.spec	Mon Oct 06 13:00:08 2003 +0000
+++ b/ORBit2.spec	Mon Oct 06 14:01:23 2003 +0000
@@ -3,26 +3,23 @@
 Group:        System/Libraries
 Provides:     ORBit2 
 Summary:      High-performance CORBA Object Request Broker
-Version:      2.6.3
-Release:      12
+Version:      2.8.1
+Release:      1
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
-Source:       http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.6/ORBit2-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.8/ORBit2-%{version}.tar.bz2
 Patch0:	      ORBit-01-no-static.diff
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-URL:          http://www.gnome.org
+URL:          http://www.gnome.org/projects/ORBit2
 DocDir:	      %{_defaultdocdir}/doc
 Autoreqprov:  on
 Prereq:	      /sbin/ldconfig
 
-%define linc_version 1.0.1
-%define libIDL_version 0.8.0
+%define libIDL_version 0.8.2
 %define popt_version 1.6.4
 
-Requires:      linc >= %{linc_version}
 Requires:      libIDL >= %{libIDL_version}
 Requires:      popt >= %{popt_version}
-BuildRequires: linc-devel >= %{linc_version}
 BuildRequires: libIDL-devel >= %{libIDL_version}
 BuildRequires: popt-devel >= %{popt_version}
 
@@ -41,8 +38,7 @@
 Provides:     ORBit2-devel
 Autoreqprov:  on
 Requires:     %name = %version 
-Requires:     linc-devel >= %{linc_version}
-Requires:      libIDL-devel >= %{libIDL_version}
+Requires:     libIDL-devel >= %{libIDL_version}
 
 %description devel
 ORBit is a high-performance CORBA (Common Object Request Broker
@@ -81,6 +77,7 @@
 %{_libdir}/orbit-2.0/Every*so*
 %{_bindir}/ior-decode-2
 %{_bindir}/typelib-dump
+%{_bindir}/linc-cleanup-sockets
 
 %files devel
 %defattr(-, root, root)
@@ -91,8 +88,12 @@
 %{_libdir}/libORBit*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/*.m4
+%{_datadir}/gtk-doc/html/ORBit2
 
 %changelog
+* Mon Oct 02 2003 - <[email protected]> 2.8.1-1
+- Update to 2.8.1.
+
 * Thu Aug 14 2003 - <[email protected]>
 - add patch to disable static linking of test programs
 - remove lib*.a and .la, except libname-server-2.a which is

--- a/linc.spec	Mon Oct 06 13:00:08 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-Name:         linc
-License:      LGPL
-Group:        System/Libraries
-Version:      1.0.3
-Release:      12
-Distribution: Mercury
-Vendor:       Sun Microsystems, Inc.
-Summary:      Network Client/Server Library
-Source:       http://ftp.gnome.org/pub/GNOME/sources/linc/1.0/linc-%{version}.tar.bz2
-URL:          http://www.gnome.org
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Docdir:       %{_defaultdocdir}/doc
-AutoReqProv:  on
-
-%define glib2_version 2.2.1
-%define pkgconfig_version 0.15.0
-%define gtk_doc_version 1.0
-
-Requires:      glib2 >= %{glib2_version}
-BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: pkgconfig >= %{pkgconfig_version}
-BuildRequires: gtk-doc >= %{gtk_doc_version}
-
-%description 
-linc is a library that eases the task of writing networked servers &
-clients. It takes care of connection initiation and maintenance, and the
-details of various transports. It is used by ORBit2 to handle message
-transmission/receipt.
-
-Currently supported transports:
-IPv4 (tested)
-UNIX domain sockets (tested)
-IPv6
-IrDA
-
-The connections can optionally be encrypted using OpenSSL.
-
-%package devel
-Summary:      Network Client/Server Development Library
-Group:        Development/Libraries/GNOME
-Requires:     %{name} = %{version}
-Requires:     glib2-devel >= %{glib2_version}
-
-%description devel
-linc is a library that eases the task of writing networked servers &
-clients. It takes care of connection initiation and maintenance, and the
-details of various transports. It is used by ORBit2 to handle message
-transmission/receipt.
-
-Currently supported transports:
-IPv4 (tested)
-UNIX domain sockets (tested)
-IPv6
-IrDA
-
-
-%prep
-%setup -q 
-
-%build
-
-CFLAGS="$RPM_OPT_FLAGS"				\
-./configure --prefix=%{_prefix}			\
-	    --sysconfdir=%{_sysconfdir}		\
-	    --with-openssl			\
-	    --disable-gtk-doc
-make
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files 
-%defattr(-, root, root)
-%{_libdir}/lib*.so.*
-
-%files devel
-%defattr(-, root, root)
-%{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/linc-1.0
-%{_datadir}/aclocal/*
-%{_prefix}/bin/linc-config
-%{_datadir}/gtk-doc/html/linc
-
-%changelog
-* Thu Aug 14 2003 - <[email protected]>
-- remove *.a, *.la
-
-* Sat Aug 02 2003 - <[email protected]>
-- Remove linc-cleanup-sockets from %files since
-  it's not installed anymore
-
-* Fri Aug 01 2003 - <[email protected]>
-- Upgrade to 1.0.3
-
-* Mon May 12 2003 - <[email protected]>
-- initial Sun release