rpms/cowbell/devel cowbell-libdir.patch, NONE, 1.1 cowbell.spec, 1.9, 1.10

[Sindre Pedersen Bjørdal (sindrepb)]

Author: sindrepb

Update of /cvs/pkgs/rpms/cowbell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1952

Modified Files:
	cowbell.spec 
Added Files:
	cowbell-libdir.patch 
Log Message:
fix x86_64 patch

cowbell-libdir.patch:

--- NEW FILE cowbell-libdir.patch ---
diff -up cowbell-0.2.7.1/cowbell.in.orig cowbell-0.2.7.1/cowbell.in
--- cowbell-0.2.7.1/cowbell.in.orig	2008-04-23 11:25:26.000000000 +0200
+++ cowbell-0.2.7.1/cowbell.in	2008-04-23 11:28:39.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-libdir="@prefix@/lib/cowbell"
+libdir="@libdir@/cowbell"
 export LD_LIBRARY_PATH=${libdir}${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
 
 if [ -e ./@dll@ ] && [ -e ./Makefile.am ]; then
diff -up cowbell-0.2.7.1/Makefile.in.orig cowbell-0.2.7.1/Makefile.in
--- cowbell-0.2.7.1/Makefile.in.orig	2008-04-23 11:25:36.000000000 +0200
+++ cowbell-0.2.7.1/Makefile.in	2008-04-23 11:27:55.000000000 +0200
@@ -306,7 +306,7 @@ wsdl_sources = $(addprefix $(srcdir)/, $
 wsdl_generated_sources = $(addprefix $(srcdir)/, $(wsdl_generated))
 build_resources = $(foreach res,$(RESOURCES), $(addprefix -resource:$(srcdir)/,$(res)),$(notdir $(res)))
 bin_SCRIPTS = $(WRAPPER)
-cowbelldir = $(prefix)/lib/cowbell
+cowbelldir = $(libdir)/cowbell
 cowbell_DATA = $(WRAPPER).exe $(WRAPPER).exe.config
 CLEANFILES = $(WRAPPER).exe $(WRAPPER).exe.mdb $(wsdl_generated) $(WRAPPER)
 EXTRA_DIST = \


Index: cowbell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/devel/cowbell.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cowbell.spec	17 Mar 2008 13:26:18 -0000	1.9
+++ cowbell.spec	23 Apr 2008 09:45:16 -0000	1.10
@@ -1,14 +1,14 @@
 Name:           cowbell
 Version:        0.2.7.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Music organazier
 
 Group:         	Applications/Multimedia 
-License:       	GPL 
+License:       	GPLv2+ 
 URL:           	http://more-cowbell.org/ 
 Source0:       	http://more-cowbell.org/releases/%{name}-%{version}.tar.gz
 #fixes libdir for x86_64
-Patch0:         cowbell-0.2.7.1-libdir.patch
+Patch0:         cowbell-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Wed Apr 23 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.2.7.1-10
+- Fix x86_64 patch
+
 * Mon Mar 17 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.2.7.1-9
 - Add ExclusiveArch to prevent build errors on unsupported archs
 - Add patch for fixing libdir path on x86_64