From 98ad6935d0d1ec17f379cf00f1e0055ca033bdbc Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Jan 28 2008 20:36:36 +0000
Subject: - Update to 2.3.0

- Bump glib2 requirement to >= 2.15.3.
- Clean up some redundant dependencies.
- Remove patch for RH bug #327871 (fixed in glibc).

---

diff --git a/.cvsignore b/.cvsignore
index 94eeeda..77725e6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libsoup-2.2.104.tar.bz2
+libsoup-2.3.0.tar.bz2
diff --git a/libsoup-2.2.101-header-breakage.patch b/libsoup-2.2.101-header-breakage.patch
deleted file mode 100644
index a2c8af5..0000000
--- a/libsoup-2.2.101-header-breakage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up libsoup-2.2.101/libsoup/soup-portability.h.header-breakage libsoup-2.2.101/libsoup/soup-portability.h
---- libsoup-2.2.101/libsoup/soup-portability.h.header-breakage	2007-06-01 16:31:34.000000000 -0400
-+++ libsoup-2.2.101/libsoup/soup-portability.h	2007-10-11 12:33:58.000000000 -0400
-@@ -17,6 +17,9 @@
- 
- #else
- 
-+/* Work around a glibc bug (#327871) */
-+#include <linux/socket.h>
-+
- #include <netinet/in.h>
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
diff --git a/libsoup.spec b/libsoup.spec
index 429f04e..e3dcc52 100644
--- a/libsoup.spec
+++ b/libsoup.spec
@@ -1,7 +1,9 @@
+%define glib2_version 2.15.3
+
 ### Abstract ###
 
 Name: libsoup
-Version: 2.2.104
+Version: 2.3.0
 Release: 1%{?dist}
 License: LGPLv2
 Group: Development/Libraries
@@ -10,20 +12,9 @@ URL: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: libsoup-%{version}.tar.bz2
 
-### Patches ###
-
-# RH bug #327871
-Patch0: libsoup-2.2.101-header-breakage.patch
-
-### Dependencies ###
-
-Requires: glib2 >= 2.6
-Requires: gnutls
-Requires: libxml2
-
 ### Build Dependencies ###
 
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnutls-devel
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
@@ -43,7 +34,7 @@ supported for those who want it).
 Summary: Header files for the Soup library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel
+Requires: glib2-devel >= %{glib2_version}
 Requires: gnutls-devel
 Requires: libxml2-devel
 Requires: pkgconfig
@@ -54,7 +45,6 @@ you to develop applications that use the libsoup library.
 
 %prep
 %setup -q -n libsoup-%{version}
-%patch -p1 -b .header-breakage
 
 %build
 %configure --disable-gtk-doc
@@ -81,12 +71,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/libsoup-2.2
+%{_includedir}/libsoup-2.4
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Mon Jan 28 2008 Matthew Barnes <mbarnes@redhat.com> - 2.3.0-1
+- Update to 2.3.0
+- Bump glib2 requirement to >= 2.15.3.
+- Clean up some redundant dependencies.
+- Remove patch for RH bug #327871 (fixed in glibc).
+
 * Mon Nov 26 2007 Matthew Barnes <mbarnes@redhat.com> - 2.2.104-1
 - Update to 2.2.104
 
diff --git a/sources b/sources
index 6065950..3cd8223 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab3b10b1c97de5abe38a748a3656da4c  libsoup-2.2.104.tar.bz2
+ce9192ee04a89c104948b67eec593eda  libsoup-2.3.0.tar.bz2