rpms/libshout/F-7 libshout-2.2.2-fix_speex.patch, NONE, 1.1 libshout.spec, 1.15, 1.16

Fri Dec 7 14:48:01 UTC 2007

Author: kwizart

Update of /cvs/pkgs/rpms/libshout/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11409

Modified Files:
	libshout.spec 
Added Files:
	libshout-2.2.2-fix_speex.patch 
Log Message:
Fix http://bugzilla.redhat.com/415121


libshout-2.2.2-fix_speex.patch:

--- NEW FILE libshout-2.2.2-fix_speex.patch ---
diff -up libshout-2.2.2/src/Makefile.in.fix_speex libshout-2.2.2/src/Makefile.in
--- libshout-2.2.2/src/Makefile.in.fix_speex	2007-12-07 15:03:46.000000000 +0100
+++ libshout-2.2.2/src/Makefile.in	2007-12-07 15:04:43.000000000 +0100
@@ -65,7 +65,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_2 =
 libshout_la_DEPENDENCIES = net/libicenet.la timing/libicetiming.la \
 	avl/libiceavl.la httpp/libicehttpp.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_2)
 am__libshout_la_SOURCES_DIST = shout.c util.c ogg.c vorbis.c mp3.c \
 	theora.c speex.c
 @HAVE_THEORA_TRUE at am__objects_1 = theora.lo
@@ -128,6 +129,7 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 FGREP = @FGREP@
+GREP = @GREP@
 HAVE_PKGCONFIG_FALSE = @HAVE_PKGCONFIG_FALSE@
 HAVE_PKGCONFIG_TRUE = @HAVE_PKGCONFIG_TRUE@
 HAVE_SPEEX_FALSE = @HAVE_SPEEX_FALSE@
@@ -199,13 +201,9 @@ VORBIS_LIBS = @VORBIS_LIBS@
 VORBIS_PREFIX = @VORBIS_PREFIX@
 XIPH_CFLAGS = @XIPH_CFLAGS@
 XIPH_CPPFLAGS = @XIPH_CPPFLAGS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 acx_pthread_config = @acx_pthread_config@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -223,23 +221,30 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 shout_cflags = @shout_cflags@
@@ -261,7 +266,7 @@ noinst_HEADERS = shout_ogg.h shout_priva
 libshout_la_SOURCES = shout.c util.c ogg.c vorbis.c mp3.c $(MAYBE_THEORA) $(MAYBE_SPEEX)
 AM_CFLAGS = @XIPH_CFLAGS@
 libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
-		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
 
 INCLUDES = -I$(top_builddir)/include
 all: all-recursive
diff -up libshout-2.2.2/src/Makefile.am.fix_speex libshout-2.2.2/src/Makefile.am
--- libshout-2.2.2/src/Makefile.am.fix_speex	2007-12-07 15:03:39.000000000 +0100
+++ libshout-2.2.2/src/Makefile.am	2007-12-07 15:04:35.000000000 +0100
@@ -26,7 +26,7 @@ libshout_la_SOURCES = shout.c util.c ogg
 AM_CFLAGS = @XIPH_CFLAGS@
 
 libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
-		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS)
+		httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(THEORA_LIBS) $(VORBIS_LIBS) $(SPEEX_LIBS)
 
 INCLUDES = -I$(top_builddir)/include
 


Index: libshout.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libshout/F-7/libshout.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libshout.spec	3 May 2007 20:52:45 -0000	1.15
+++ libshout.spec	7 Dec 2007 14:47:27 -0000	1.16
@@ -1,25 +1,24 @@
 Name:           libshout
 Version:        2.2.2
-Release:        1%{?dist}
-Summary:        icecast source streaming library
+Release:        2%{?dist}
+Summary:        Icecast source streaming library
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 URL:            http://www.icecast.org/
 Source:         http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz
+Patch0:         libshout-2.2.2-fix_speex.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libogg-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libtheora-devel
 BuildRequires:  speex-devel
 
-# so it generates and installs the .pc file
-BuildRequires:  pkgconfig
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-ibshout is a library for communicating with and sending data to an
+libshout is a library for communicating with and sending data to an
 icecast server.  It handles the socket connection, the timing of the
 data, and prevents most bad data from getting to the icecast server.
 
@@ -40,15 +39,20 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix_speex
 
 %build
-%configure
+%configure --disable-static
+
+# clean unused-direct-shlib-dependencies
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
+
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p " install
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
@@ -69,7 +73,6 @@
 %files devel
 %defattr(-,root,root,-)
 %doc examples/*.c doc/*.xml doc/*.xsl
-%{_libdir}/libshout.a
 %{_libdir}/libshout.so
 %{_libdir}/pkgconfig/shout.pc
 %dir %{_includedir}/shout/
@@ -77,6 +80,12 @@
 %{_datadir}/aclocal/shout.m4
 
 %changelog
+* Fri Dec  7 2007 kwizart < kwizart at gmail.com > - 2.2.2-2
+- Fix http://bugzilla.redhat.com/415121
+- Add disable-static
+- Don't use makeinstall macro
+- Update License field
+
 * Thu Sep 07 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 2.2.2-1
 - updated to new release


