rpms/cowbell/F-8 cowbell-libdir.patch, NONE, 1.1 cowbell.spec, 1.7, 1.8

[Sindre Pedersen Bjørdal (sindrepb)]

Author: sindrepb

Update of /cvs/pkgs/rpms/cowbell/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10174

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/F-8/cowbell.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cowbell.spec	3 Oct 2006 19:46:47 -0000	1.7
+++ cowbell.spec	23 Apr 2008 10:30:17 -0000	1.8
@@ -1,14 +1,19 @@
 Name:           cowbell
 Version:        0.2.7.1
-Release:        7%{?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-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# We only have mono on these arches:
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+
 BuildRequires: 	mono-devel, gtk-sharp2-devel, gtk-sharp2-gapi
 BuildRequires: 	taglib-devel 
 BuildRequires:  scrollkeeper, desktop-file-utils, gettext
@@ -26,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -80,6 +86,16 @@
 
 
 %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
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.7.1-8
+- Autorebuild for GCC 4.3
+
 * Tue Oct 03 2006 Sindre Pedersen Bjørdal <foolish[AT]guezz.net> - 0.2.7.1-7
 - Don't replace %{_libdir}
 * Fri Sep 15 2006 Sindre Pedersen Bjørdal <foolish[AT]guezz.net> - 0.2.7.1-6