[banshee] * Tue Aug 17 2010 Christian Krause <chkr at fedoraproject.org> - 1.7.4-1 - Update to development releas

chkr chkr at fedoraproject.org
Mon Aug 16 22:59:09 UTC 2010 

commit 210be1a4ed295d32487e5bcccdd35a73954c41e4
Author: Christian Krause <christian.krause at raritan.com>
Date:   Tue Aug 17 00:58:58 2010 +0200

    * Tue Aug 17 2010 Christian Krause <chkr at fedoraproject.org> - 1.7.4-1
    - Update to development release 1.7.4 (BZ 623624)
    - Remove upstreamed patches
    - Add patches to avoid calling update-mime-database or
      update-desktop-database during "make install"
    - Cleanup scriptlets
    - Add update-mime-database to %post / %postun

 .gitignore                                         |    1 +
 ...sr-lib-banshee-1-Backends-to-library-path.patch |   29 ---
 banshee-1.6.1-transparent-icon.patch               |  209 --------------------
 banshee-1.7.4-no-update-desktop-database.patch     |   12 ++
 banshee-1.7.4-no-update-mime-database.patch        |   14 ++
 banshee.spec                                       |   52 +++---
 sources                                            |    2 +-
 7 files changed, 57 insertions(+), 262 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58e81b0..139e900 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 banshee-1-1.6.1.tar.bz2
+banshee-1-1.7.4.tar.bz2
diff --git a/banshee-1.7.4-no-update-desktop-database.patch b/banshee-1.7.4-no-update-desktop-database.patch
new file mode 100644
index 0000000..3e378fa
--- /dev/null
+++ b/banshee-1.7.4-no-update-desktop-database.patch
@@ -0,0 +1,12 @@
+diff -uNr banshee-1-1.7.4.old/data/desktop-files/Makefile.in banshee-1-1.7.4/data/desktop-files/Makefile.in
+--- banshee-1-1.7.4.old/data/desktop-files/Makefile.in	2010-08-11 21:42:54.000000000 +0200
++++ banshee-1-1.7.4/data/desktop-files/Makefile.in	2010-08-15 15:25:22.000000000 +0200
+@@ -595,8 +595,6 @@
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-install-data-hook:
+-	test "$(top_srcdir)" = "$(top_builddir)" && update-desktop-database $(DESTDIR)$(datadir)/applications || :
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/banshee-1.7.4-no-update-mime-database.patch b/banshee-1.7.4-no-update-mime-database.patch
new file mode 100644
index 0000000..8d5941e
--- /dev/null
+++ b/banshee-1.7.4-no-update-mime-database.patch
@@ -0,0 +1,14 @@
+diff -uNr banshee-1-1.7.4.old/src/Extensions/Banshee.AmazonMp3/Makefile.in banshee-1-1.7.4/src/Extensions/Banshee.AmazonMp3/Makefile.in
+--- banshee-1-1.7.4.old/src/Extensions/Banshee.AmazonMp3/Makefile.in	2010-08-11 21:42:59.000000000 +0200
++++ banshee-1-1.7.4/src/Extensions/Banshee.AmazonMp3/Makefile.in	2010-08-15 14:57:26.000000000 +0200
+@@ -844,10 +844,6 @@
+ bamz: bamz.in
+ 	@echo '  GEN   $@'; sed 's, at bansheedir@,$(pkglibdir),g' < $< > $@
+ 
+-define EXTRA_INSTALL_DATA_HOOK
+-	test "$(top_srcdir)" = "$(top_builddir)" && update-mime-database -V $(DESTDIR)$(datadir)/mime || :
+-endef
+-
+ all: $(ASSEMBLY_FILE) theme-icons
+ 
+ run: 
diff --git a/banshee.spec b/banshee.spec
index 11d75d4..135344e 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -1,5 +1,5 @@
 %global mono_shared %{_builddir}/%{?buildsubdir}
-%global mainver 1.6.1
+%global mainver 1.7.4
 
 #%global gitdate 20091216
 #%global gitcommit 8e29a44269cd4b2a27822e62815f5bc6e22dfb58
@@ -7,7 +7,7 @@
 Name:    banshee
 Version: %{mainver}%{?patchver}
 #Release: 0.1.%{gitdate}git%{?dist}
-Release: 5%{?dist}
+Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -17,20 +17,16 @@ URL:     http://banshee-project.org/
 # based on libdrm's make-git-snapshot.sh 
 # sh banshee-make-git-snapshot.sh <gitcommit> <gitdate>
 #Source0: %{name}-%{gitdate}.tar.bz2
-Source0: http://download.banshee-project.org/banshee/stable/%{mainver}/banshee-1-%{version}.tar.bz2
+Source0: http://download.banshee-project.org/banshee/unstable/%{mainver}/banshee-1-%{version}.tar.bz2
 Source1: README.Fedora
 #Source2: %{name}-make-git-snapshot.sh
 
 # for snapshots only: don't run configure at the end of autogen.sh
 #Patch0:  %{name}-noconf.patch
 
-# avoid DllNotFoundException: libbnpx11
-# https://bugzilla.gnome.org/show_bug.cgi?id=622028
-Patch1: 0001-Add-usr-lib-banshee-1-Backends-to-library-path.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=588255
-# https://bugzilla.gnome.org/attachment.cgi?id=164158 (white spaces fixed)
-Patch2: banshee-1.6.1-transparent-icon.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=625264
+Patch1: banshee-1.7.4-no-update-mime-database.patch
+Patch2: banshee-1.7.4-no-update-desktop-database.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -91,6 +87,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: autoconf automake libtool
 
 
+Requires:      shared-mime-info
 Requires:      gstreamer-plugins-good
 Requires:      podsleuth >= 0.6.6
 Requires:      libmtp-hal
@@ -147,9 +144,9 @@ developing applications that use %{name}-musicbrainz.
 #%setup -q -n %{name}-%{gitdate}
 # Snapshots only
 #%patch0 -p1 -b .noconf
-%patch1 -p1 -b .ldlibdir_fix
 cp -p %{SOURCE1} .
-%patch2 -p1 -b .transparent_icon
+%patch1 -p1 -b .no-update-mime-database
+%patch2 -p1 -b .no-update-desktop-database
 
 %build
 export MONO_SHARED_DIR=%mono_shared
@@ -188,22 +185,21 @@ desktop-file-install --vendor gnome --delete-original \
 %{__rm} -rf  %{buildroot}
 
 %post
-update-desktop-database %{_datadir}/applications
-
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
 
 %postun
-update-desktop-database %{_datadir}/applications
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}-1.lang
 %defattr(-,root,root,-)
@@ -212,6 +208,7 @@ fi
 %doc COPYING AUTHORS README README.Fedora NEWS
 %{_bindir}/banshee-1
 %{_bindir}/muinshee
+%{_bindir}/bamz
 %exclude %{_libdir}/banshee-1/MusicBrainz.dll*
 %{_libdir}/banshee-1
 %{_datadir}/applications/*.desktop
@@ -219,7 +216,8 @@ fi
 %{_datadir}/dbus-1/services/org.bansheeproject.CollectionIndexer.service
 %{_datadir}/banshee-1/
 %{_datadir}/icons/hicolor/*/apps/media-player-banshee.png
-#%exclude %{_datadir}/icons/hicolor/icon-theme.cache
+%{_datadir}/gnome/help/banshee
+%{_datadir}/mime/packages/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -237,6 +235,14 @@ fi
 
 
 %changelog
+* Tue Aug 17 2010 Christian Krause <chkr at fedoraproject.org> - 1.7.4-1
+- Update to development release 1.7.4 (BZ 623624)
+- Remove upstreamed patches
+- Add patches to avoid calling update-mime-database or
+  update-desktop-database during "make install"
+- Cleanup scriptlets
+- Add update-mime-database to %%post / %%postun
+
 * Sat Jun 26 2010 Christian Krause <chkr at fedoraproject.org> - 1.6.1-5
 - Fix status icon transparency (BZ 533308)
 
diff --git a/sources b/sources
index c23954e..538c40e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3456dfa052d9a323f68d3763212c23d  banshee-1-1.6.1.tar.bz2
+364eb71089d3268591a53c8211daa9d4  banshee-1-1.7.4.tar.bz2

More information about the scm-commits mailing list