rpms/cowbell/devel cowbell-0.3-libdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cowbell-libdir.patch, 1.1, 1.2 cowbell.spec, 1.10, 1.11 sources, 1.2, 1.3

[Sindre Pedersen Bjørdal (sindrepb)]

Author: sindrepb

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

Modified Files:
	.cvsignore cowbell-libdir.patch cowbell.spec sources 
Added Files:
	cowbell-0.3-libdir.patch 
Log Message:
new release

cowbell-0.3-libdir.patch:

--- NEW FILE cowbell-0.3-libdir.patch ---
diff -up cowbell/base/Makefile.am.orig cowbell/base/Makefile.am
--- cowbell/base/Makefile.am.orig	2008-05-13 03:24:13.000000000 +0200
+++ cowbell/base/Makefile.am	2008-05-13 03:25:13.000000000 +0200
@@ -37,7 +37,7 @@ all: $(DLL)
 $(DLL): $(build_sources) $(RESOURCES)
 	$(CSC) /warnaserror /t:library /codepage:utf8 /debug /out:$@ $(REFERENCES) $(build_sources)
 
-cowbelldir = $(prefix)/lib/cowbell
+cowbelldir = $(libdir)/cowbell
 cowbell_DATA = $(DLL)
 
 CLEANFILES = $(DLL) $(DLL).mdb
diff -up cowbell/gui/Makefile.am.orig cowbell/gui/Makefile.am
--- cowbell/gui/Makefile.am.orig	2008-05-13 03:24:20.000000000 +0200
+++ cowbell/gui/Makefile.am	2008-05-13 03:25:20.000000000 +0200
@@ -55,7 +55,7 @@ $(WRAPPER): $(srcdir)/$(WRAPPER).in
 	chmod +x $(WRAPPER)
 
 bin_SCRIPTS = $(WRAPPER)
-cowbelldir = $(prefix)/lib/cowbell
+cowbelldir = $(libdir)/cowbell
 cowbell_DATA = $(ASSEMBLY) $(ASSEMBLY).config
 
 CLEANFILES = $(WRAPPER) $(ASSEMBLY) $(ASSEMBLY).mdb
diff -up cowbell/musicbrainz-sharp/Makefile.am.orig cowbell/musicbrainz-sharp/Makefile.am
--- cowbell/musicbrainz-sharp/Makefile.am.orig	2008-05-13 03:24:30.000000000 +0200
+++ cowbell/musicbrainz-sharp/Makefile.am	2008-05-13 03:25:01.000000000 +0200
@@ -30,7 +30,7 @@ $(DLL): $(build_sources)
 	$(CSC) /warnaserror /t:library /codepage:utf8 /debug /out:$@ $(REFERENCES) $(build_sources)
 	cp $(DLL) ../gui
 
-cowbelldir = $(prefix)/lib/cowbell
+cowbelldir = $(libdir)/cowbell
 cowbell_DATA = $(DLL)
 
 CLEANFILES = $(DLL) $(DLL).mdb


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 May 2006 23:09:45 -0000	1.2
+++ .cvsignore	13 May 2008 02:19:13 -0000	1.3
@@ -1 +1 @@
-cowbell-0.2.7.1.tar.gz
+cowbell-0.3-0.svn34.1.fc10.src.rpm

cowbell-libdir.patch:

Index: cowbell-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/devel/cowbell-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cowbell-libdir.patch	23 Apr 2008 09:45:16 -0000	1.1
+++ cowbell-libdir.patch	13 May 2008 02:19:13 -0000	1.2
@@ -5,7 +5,7 @@
  #!/bin/sh
  
 -libdir="@prefix@/lib/cowbell"
-+libdir="@libdir@/cowbell"
++libdir="LIBDIR/cowbell"
  export LD_LIBRARY_PATH=${libdir}${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
  
  if [ -e ./@dll@ ] && [ -e ./Makefile.am ]; then


Index: cowbell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/devel/cowbell.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cowbell.spec	23 Apr 2008 09:45:16 -0000	1.10
+++ cowbell.spec	13 May 2008 02:19:13 -0000	1.11
@@ -1,21 +1,23 @@
 Name:           cowbell
-Version:        0.2.7.1
-Release:        10%{?dist}
+Version:        0.3
+Release:        0.svn34.1%{?dist}
 Summary:        Music organazier
 
 Group:         	Applications/Multimedia 
 License:       	GPLv2+ 
 URL:           	http://more-cowbell.org/ 
-Source0:       	http://more-cowbell.org/releases/%{name}-%{version}.tar.gz
+Source0:       	http://more-cowbell.org/releases/%{name}-%{version}-svn34.tar.bz2
 #fixes libdir for x86_64
-Patch0:         cowbell-libdir.patch
+Patch0:         cowbell-0.3-libdir.patch
+Patch1:         cowbell-0.3-AboutDialog.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:  gnome-common, automake, autoconf, libtool, intltool
 BuildRequires: 	mono-devel, gtk-sharp2-devel, gtk-sharp2-gapi
-BuildRequires: 	taglib-devel 
+BuildRequires: 	taglib-sharp-devel 
 BuildRequires:  scrollkeeper, desktop-file-utils, gettext
 BuildRequires:	perl-XML-Parser
 Requires:	mono-core, gtk-sharp2
@@ -25,15 +27,22 @@
 
 %description
 Cowbell is an elegant, album-based, music organizer
-written by Brad Taylor in C# for Gtk+. Using TagLib, 
+written by Brad Taylor in C-sharp for Gtk+. Using TagLib, 
 it supports many audio formats including: Mp3, Ogg 
 Vorbis and MusePack
 
 %prep
-%setup -q
+%setup -qn cowbell
 %patch0 -p1
+%patch1 -p1
+
+#fix cowbell multiarch
+#cat cowbell.in | sed s,LIBDIR,%{_libdir}, > cowbell.in.new
+#rm cowbell.in 
+#mv cowbell.in.new cowbell.in
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -86,6 +95,9 @@
 
 
 %changelog
+* Wed Apr 23 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.2.7.1-11
+- Add sed shebang to set libdir on all arches, should actually work now
+
 * Wed Apr 23 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.2.7.1-10
 - Fix x86_64 patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 May 2006 23:09:45 -0000	1.2
+++ sources	13 May 2008 02:19:13 -0000	1.3
@@ -1 +1 @@
-fcf32bcf60be2ca204519192eb26bacc  cowbell-0.2.7.1.tar.gz
+f319abd69f659aa05bc080a374625d87  cowbell-0.3-0.svn34.1.fc10.src.rpm