rpms/amarok/FC-4 amarok-1.2.4-workaround-missing-libfam.la.patch, NONE, 1.1 amarok.spec, 1.15, 1.16

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13831

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.2.4-workaround-missing-libfam.la.patch 
Log Message:
* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-2.fc4
- temporarily add patch to work around Fedora Core bug 159090



amarok-1.2.4-workaround-missing-libfam.la.patch:

--- NEW FILE amarok-1.2.4-workaround-missing-libfam.la.patch ---
diff -Nur amarok-1.2.4-orig/admin/ltmain.sh amarok-1.2.4/admin/ltmain.sh
--- amarok-1.2.4-orig/admin/ltmain.sh	2005-05-19 19:00:19.000000000 +0200
+++ amarok-1.2.4/admin/ltmain.sh	2005-06-02 01:14:37.000000000 +0200
@@ -2040,6 +2040,8 @@
 	*/* | *\\*) . $lib ;;
 	*) . ./$lib ;;
 	esac
+	# Temporary work-around for missing %{_libdir}/libfam.la
+	test -n "$dependency_libs" && dependency_libs=$(echo $dependency_libs | sed 's![^ ]*libfam.la!!')
 
 	case $host in
 	*-*-darwin*)


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- amarok.spec	29 May 2005 13:51:40 -0000	1.15
+++ amarok.spec	1 Jun 2005 23:31:42 -0000	1.16
@@ -7,13 +7,14 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.2.4
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
+Patch1:     amarok-1.2.4-workaround-missing-libfam.la.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -93,6 +94,7 @@
 %setup -q
 # remove test for GCC blacklisting
 %patch0 -p1 -b .gcc4bl
+%patch1 -p1 -b .workaround-missing-libfam.la
 
 
 %build
@@ -202,6 +204,9 @@
 
 
 %changelog
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-2.fc4
+- temporarily add patch to work around Fedora Core bug 159090
+
 * Mon May 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-1
 - version 1.2.4
 - use dist tag