From c5ada0e734e1fb70b3aa5f876c311f1b40aa4fde Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Tue, 7 Apr 2009 19:31:08 +0000
Subject: [PATCH] * Tue Apr 07 2009 Dominik Mierzejewski
 <rpm[AT]greysector.net> - 0-0.22.2009.04.07 - 2009.04.07 - use new debian
 patchset

---
 .gitignore                   |  4 ++--
 live.2008.02.08-shared.patch | 14 +++++++-------
 live555.spec                 | 12 +++++++-----
 sources                      |  6 +++---
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4952c2b..26fd918 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-live.2008.07.25.tar.gz
 changelog.txt
-liblivemedia_2007.02.20-2.diff.gz
+liblivemedia_2008.07.25-2.diff.gz
+live.2009.04.07.tar.gz
diff --git a/live.2008.02.08-shared.patch b/live.2008.02.08-shared.patch
index da85390..708f5e0 100644
--- a/live.2008.02.08-shared.patch
+++ b/live.2008.02.08-shared.patch
@@ -1,16 +1,16 @@
-diff -up live/config.linux.shared live/config.linux
---- live/config.linux.shared	2008-04-23 17:09:41.000000000 +0200
-+++ live/config.linux	2008-04-23 17:12:00.000000000 +0200
+diff -up live/config.linux.static live/config.linux
+--- live/config.linux.static	2009-04-07 20:48:47.000000000 +0200
++++ live/config.linux	2009-04-07 20:50:46.000000000 +0200
 @@ -9,9 +9,9 @@ OBJ =			o
  LINK =			c++ -o
  LINK_OPTS =		-L.
  CONSOLE_LINK_OPTS =	$(LINK_OPTS)
--LIBRARY_LINK =		ar rcvu 
--LIBRARY_LINK_OPTS =	
+-LIBRARY_LINK =		ld -o
+-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
 -LIB_SUFFIX =			a
-+LIBRARY_LINK =		$(CC) -o 
++LIBRARY_LINK =		$(CC) -o
 +LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@.$(SO_VERSION) $(LIBADDS)
-+LIB_SUFFIX =			so
++LIB_SUFFIX =		so
  LIBS_FOR_CONSOLE_APPLICATION =
  LIBS_FOR_GUI_APPLICATION =
  EXE =
diff --git a/live555.spec b/live555.spec
index 9b1898a..fce279c 100644
--- a/live555.spec
+++ b/live555.spec
@@ -1,9 +1,9 @@
-%define		date	2008.07.25
+%define		date	2009.04.07
 %define		live_soversion 0
 
 Name:		live555
 Version:	0
-Release:	0.21.%{date}%{?dist}
+Release:	0.22.%{date}%{?dist}
 Summary:	Live555.com streaming libraries
 
 Group:		System Environment/Libraries
@@ -12,7 +12,7 @@ URL:		http://live555.com/liveMedia/
 Source0:	http://live555.com/liveMedia/public/live.%{date}.tar.gz
 # http://live555.com/liveMedia/public/changelog.txt
 Source1:	changelog.txt
-Patch0:		http://ftp.debian.org/debian/pool/main/libl/liblivemedia/liblivemedia_2007.02.20-2.diff.gz
+Patch0:		http://ftp.debian.org/debian/pool/main/libl/liblivemedia/liblivemedia_2008.07.25-2.diff.gz
 Patch1:		live.2008.02.08-shared.patch
 Patch2:		live.2008.04.03-reorder.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,8 +85,6 @@ developing applications that use %{name}.
 %patch0 -p1
 patch -p1 -i debian/patches/010_propagate_cflags.diff
 patch -p1 -i debian/patches/010_proper_link_order.diff
-patch -p1 -i debian/patches/010_static_link.diff
-patch -p1 -i debian/patches/020_cxx_headers.diff
 patch -p1 -i debian/patches/020_invalid_casts.diff
 patch -p1 -i debian/patches/021_ip_mreq_source.diff
 cp -p %{SOURCE1} .
@@ -211,6 +209,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libUsageEnvironment*.a
 
 %changelog
+* Tue Apr 07 2009 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.22.2009.04.07
+- 2009.04.07
+- use new debian patchset
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0-0.21.2008.07.25
 - rebuild for new F11 features
 
diff --git a/sources b/sources
index f4c6b52..9347428 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-32e7bd2fdb04d0b05462b24d42409ec7  live.2008.07.25.tar.gz
-4bf8822d97282bd99a8b1cde8e6da84e  changelog.txt
-09a40aa249d1598923a68b35d6fcb5ea  liblivemedia_2007.02.20-2.diff.gz
+0586323f75b5e138cf95eca43d5ea47d  changelog.txt
+46866494537e840f76772dedafff7ffa  liblivemedia_2008.07.25-2.diff.gz
+724d6779ae6363545d9e83808e5cec2e  live.2009.04.07.tar.gz