rpms/banshee/devel banshee-clutter10.patch, NONE, 1.1 banshee-make-git-snapshot.sh, NONE, 1.1 banshee-noconf.patch, NONE, 1.1 banshee.spec, 1.79, 1.80

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/banshee/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17370

Modified Files:
	banshee.spec 
Added Files:
	banshee-clutter10.patch banshee-make-git-snapshot.sh 
	banshee-noconf.patch 
Log Message:
* Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.2.git20090831%{?dist}
- Build with clutter support

* Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.1.git20090831%{?dist}
- Update to latest snapshot


banshee-clutter10.patch:
 libbanshee.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE banshee-clutter10.patch ---
--- banshee/build/m4/banshee/libbanshee.m4.clutter10	2009-08-18 23:27:11.097823106 -0400
+++ banshee/build/m4/banshee/libbanshee.m4	2009-08-31 17:08:21.858796118 -0400
@@ -26,7 +26,7 @@
 	fi
 
 	PKG_CHECK_MODULES(CLUTTER,
-		clutter-0.9 >= 0.9.5,
+		clutter-1.0,
 		enable_clutter=yes, enable_clutter=no)
 
 	if test "x$enable_clutter" = "xyes"; then


--- NEW FILE banshee-make-git-snapshot.sh ---
#!/bin/sh

# Usage: ./banshee-make-git-snapshot.sh [COMMIT] [DATE]
#
# to make a snapshot of the given tag/branch.  Defaults to HEAD.
# Point env var REF to a local banshee repo to reduce clone time.

if [ -z $2 ]; then
  DATE=`date +%Y%m%d`
else
  DATE=$2
fi

DIRNAME="banshee-$DATE"

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
        git://git.gnome.org/banshee $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
        | bzip2 > $DIRNAME.tar.bz2

rm -rf $DIRNAME


banshee-noconf.patch:
 autogen.sh |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE banshee-noconf.patch ---
--- banshee/autogen.sh.noconf	2009-08-18 23:27:11.088823117 -0400
+++ banshee/autogen.sh	2009-08-31 15:51:07.340801936 -0400
@@ -77,5 +77,3 @@
 	echo "WARNING: I am going to run configure without any arguments."
 fi
 
-run ./configure --enable-maintainer-mode $@
-


Index: banshee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- banshee.spec	27 Aug 2009 07:05:27 -0000	1.79
+++ banshee.spec	31 Aug 2009 21:20:45 -0000	1.80
@@ -1,18 +1,32 @@
 %define mono_shared %{_builddir}/%{?buildsubdir}
 
+%define gitdate   20090831
+%define gitcommit f5c708c3adf2b30a26c62ca5f266ff0b5448d458
+
 Name:    banshee
-Version: 1.5.0
-Release: 3%{?dist}
+Version: 1.5.1
+Release: 0.2.git%{gitdate}%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
+
 Group:   Applications/Multimedia
 License: MIT
 URL:     http://banshee-project.org/
-Source0: http://download.banshee-project.org/banshee/unstable/%{version}/banshee-1-%{version}.tar.bz2
+# based on libdrm's make-git-snapshot.sh 
+# sh banshee-make-git-snapshot.sh <gitcommit> <gitdate>
+Source2: %{name}-make-git-snapshot.sh
+Source0: %{name}-%{gitdate}.tar.bz2
 Source1: README.Fedora
+# for snapshots only: don't run configure at the end of autogen.sh
+Patch0:  %{name}-noconf.patch
+# clutter's .pc filename has changed
+Patch1:  %{name}-clutter10.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # We only have mono on these arches:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha ppc ppc64
+
+# Snapshots only
+BuildRequires: autoconf automake libtool
 
 # Versioned dependencies
 BuildRequires: libmusicbrainz-devel >= 2.1.1
@@ -41,26 +55,25 @@ BuildRequires: libXxf86vm-devel
 # Misc
 BuildRequires: gettext-devel intltool perl(XML::Parser)
 
-# No boo-devel for ppc but we owe it to the users to keep banshee up to date
+# No boo-devel for ppc* but we owe it to the users to keep banshee up to date
 %ifarch  %ix86 x86_64 sparc
 BuildRequires: boo-devel
 %endif
 
-# Rawhide
+# monotorrent-dbus not in Fedora yet
+
 %if 0%{?fedora} >= 11
-# clutter >= 0.9.3 not in F-11 yet
-#BuildRequires: clutter-devel
+BuildRequires: mono-nunit-devel
 
-# monotorrent-dbus not in Fedora yet
 #BuildRequires: monotorrent-dbus-devel
-BuildRequires: mono-nunit-devel
-%endif
+%if %{?fedora} >= 12
+# needs clutter >= 0.9.3; F-11 has 0.8.8
+BuildRequires: clutter-devel
+%endif # F-12 and up
 
-BuildRequires: desktop-file-utils
+%endif # F-11 and up
 
-# bug 484996: until f-spot stops "providing" mono-addins, we have
-# to explicitly depend on it
-Requires:      mono-addins
+BuildRequires: desktop-file-utils
 
 Requires:      podsleuth
 Requires:      libmtp
@@ -113,11 +126,14 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n %{name}-1-%{version}
+%setup -q -n %{name}-%{gitdate}
+%patch0 -p1 -b .noconf
+%patch1 -p1 -b .clutter10
 cp -p %{SOURCE1} .
 
 %build
 export MONO_SHARED_DIR=%mono_shared
+./autogen.sh
 %configure  --disable-docs --enable-mtp --enable-ipod --enable-podcast \
 %ifnarch %ix86 x86_64 sparc
             --disable-boo \
@@ -170,7 +186,8 @@ fi
 
 %files -f %{name}-1.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README README.Fedora NEWS
+# ChangeLog not in snapshot
+%doc COPYING AUTHORS README README.Fedora NEWS
 %{_bindir}/banshee-1
 %exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
@@ -199,6 +216,12 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.2.git20090831%{?dist}
+- Build with clutter support
+
+* Mon Aug 31 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.1-0.1.git20090831%{?dist}
+- Update to latest snapshot
+
 * Thu Aug 27 2009 Michel Salim <salimma at fedoraproject.org> - 1.5.0-3
 - Rebuild for boo update
 - Remove unused dependency on nautilus-cd-burner