rpms/xmms-flac/devel xmms-flac-1.1.4-rpath.patch, NONE, 1.1 xmms-flac.spec, 1.7, 1.8 flac-1.1.2-libtool.patch, 1.1, NONE flac-1.1.2-xmms.patch, 1.2, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/xmms-flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25167

Modified Files:
	xmms-flac.spec 
Added Files:
	xmms-flac-1.1.4-rpath.patch 
Removed Files:
	flac-1.1.2-libtool.patch flac-1.1.2-xmms.patch 
Log Message:
Include patch to remove rpath usage and link against external libFLAC.


xmms-flac-1.1.4-rpath.patch:

--- NEW FILE xmms-flac-1.1.4-rpath.patch ---
diff -Naupr flac-1.1.4.orig/src/plugin_xmms/Makefile.am flac-1.1.4/src/plugin_xmms/Makefile.am
--- flac-1.1.4.orig/src/plugin_xmms/Makefile.am	2007-02-02 07:25:04.000000000 +0100
+++ flac-1.1.4/src/plugin_xmms/Makefile.am	2007-08-23 12:03:05.000000000 +0200
@@ -30,7 +30,7 @@ noinst_HEADERS = \
 	plugin.h \
 	tag.h
 
-AM_CFLAGS = @OGG_CFLAGS@ @XMMS_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@ @XMMS_CFLAGS@ -lFLAC
 
 INCLUDES = -I$(top_srcdir)/src
 if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
@@ -62,8 +62,7 @@ libxmms_flac_la_LIBADD = \
 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
 	$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
 	$(top_builddir)/src/share/utf8/libutf8.la \
-	$(top_builddir)/src/libFLAC/libFLAC.la \
-	-L$(top_builddir)/src/libFLAC/.libs \
+	-lFLAC \
 	@OGG_LIBS@ \
 	@XMMS_LIBS@ \
 	@LIBICONV@
diff -Naupr flac-1.1.4.orig/src/plugin_xmms/Makefile.in flac-1.1.4/src/plugin_xmms/Makefile.in
--- flac-1.1.4.orig/src/plugin_xmms/Makefile.in	2007-02-14 07:14:19.000000000 +0100
+++ flac-1.1.4/src/plugin_xmms/Makefile.in	2007-08-23 12:03:20.000000000 +0200
@@ -235,7 +235,7 @@ noinst_HEADERS = \
 	tag.h
 
 
-AM_CFLAGS = @OGG_CFLAGS@ @XMMS_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@ @XMMS_CFLAGS@ -lFLAC
 
 INCLUDES = -I$(top_srcdir)/src
 @FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE at xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@
@@ -261,8 +261,7 @@ libxmms_flac_la_LIBADD = \
 	$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
 	$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
 	$(top_builddir)/src/share/utf8/libutf8.la \
-	$(top_builddir)/src/libFLAC/libFLAC.la \
-	-L$(top_builddir)/src/libFLAC/.libs \
+	-lFLAC \
 	@OGG_LIBS@ \
 	@XMMS_LIBS@ \
 	@LIBICONV@


Index: xmms-flac.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/devel/xmms-flac.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmms-flac.spec	15 Feb 2007 15:55:13 -0000	1.7
+++ xmms-flac.spec	23 Aug 2007 10:26:46 -0000	1.8
@@ -3,13 +3,17 @@
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
 Version: 1.1.4
-Release: 1%{?dist}
-License: GPL
+Release: 3%{?dist}
+# The entire FLAC sources are covered by multiple licenses, but the xmms plugin
+# is only GPLv2+
+License: GPLv2+
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
 Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Patch0: xmms-flac-1.1.4-rpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: xmms-devel, libogg-devel, gettext-devel
+BuildRequires: flac-devel
 
 %description
 FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming,
@@ -18,7 +22,8 @@
 
 
 %prep
-%setup -n flac-%{version}
+%setup -q -n flac-%{version}
+%patch0 -p1 -b .rpath
 
 
 %build
@@ -37,12 +42,18 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc COPYING.GPL
 %{xmms_inputdir}/libxmms-flac.so
 
 
 %changelog
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.1.4-3
+- Include patch to remove rpath usage and link against external libFLAC.
+
+* Fri Aug  3 2007 Matthias Saou <http://freshrpms.net/> 1.1.4-2
+- Update License field.
+
 * Thu Feb 15 2007 Matthias Saou <http://freshrpms.net/> 1.1.4-1
 - Update to 1.1.4.
 - Remove now included "xmms" patch.


--- flac-1.1.2-libtool.patch DELETED ---


--- flac-1.1.2-xmms.patch DELETED ---