From cf44886f111509bf1bd291f7f11ba2fb5f17e181 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 19 Dec 2006 05:48:29 +0000
Subject: [PATCH] 2.14.4

---
 .cvsignore  |  2 +-
 ORBit2.spec | 21 ++++++++++-----------
 sources     |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index b5f6288..8a146c7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ORBit2-2.14.3.tar.bz2
+ORBit2-2.14.4.tar.bz2
diff --git a/ORBit2.spec b/ORBit2.spec
index c7f9a7a..e5b71a8 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -3,12 +3,12 @@
 
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
-Version: 2.14.3
-Release: 4%{?dist}
+Version: 2.14.4
+Release: 1%{?dist}
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org/projects/ORBit2/
 BuildRequires: libIDL-devel >= %{libidl_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -19,10 +19,8 @@ BuildRequires: automake
 BuildRequires: gtk-doc
 
 Patch0: ORBit2-2.14.3-multilib.patch
-# fixed in upstream cvs
-Patch1: ORBit2-2.14.3-non-local-ipv4.patch
 # handle ref leaks in the a11y stack more gracefully
-Patch2: ORBit2-2.14.3-ref-leaks.patch
+Patch1: ORBit2-2.14.3-ref-leaks.patch
 
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker 
@@ -42,7 +40,7 @@ Group: Development/Libraries
 Requires: indent
 Requires: glib2-devel
 Requires: libIDL-devel >= %{libidl_version}
-Requires: ORBit2 = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel >= %{glib2_version}
 Requires: pkgconfig
 Conflicts: ORBit-devel <= 1:0.5.8
@@ -59,15 +57,14 @@ write such programs, you'll also need to install the ORBIT package.
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .non-local-ipv4
-%patch2 -p1 -b .ref-leaks
+%patch1 -p1 -b .ref-leaks
  
 %build
 ## the shipped libtool is broken wrt. multilib
 libtoolize --force --copy
 aclocal
 autoconf
-%configure --disable-gtk-doc --enable-purify
+%configure --disable-gtk-doc --enable-purify --disable-static
 make
 
 %install
@@ -119,7 +116,6 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_bindir}/orbit-idl-2
@@ -133,6 +129,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Dec 19 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.4-1
+- Update to 2.14.4
+
 * Fri Dec  8 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.3-4
 - Handle ref leaks in the a11y stack more gracefully (#214795)
 
diff --git a/sources b/sources
index 13eb844..44927e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-857881e7aabf849016de9a1e9c53b328  ORBit2-2.14.3.tar.bz2
+8379d4dab8cab57c51372ff4facbe5d6  ORBit2-2.14.4.tar.bz2