[banshee] - Add patch to properly comment out some make rules (BZ 631387)

[chkr]

commit 43ebd31e12db14b0058abb75ed97fb5f751b26e1
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Wed Sep 8 00:23:35 2010 +0200

    - Add patch to properly comment out some make rules (BZ 631387)

 banshee-1-1.7.4-build.patch |   50 +++++++++++++++++++++++++++++++++++++++++++
 banshee.spec                |    8 ++++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/banshee-1-1.7.4-build.patch b/banshee-1-1.7.4-build.patch
new file mode 100644
index 0000000..b498629
--- /dev/null
+++ b/banshee-1-1.7.4-build.patch
@@ -0,0 +1,50 @@
+diff -uNr banshee-1-1.7.4.old/src/Hyena/build/Makefile.am banshee-1-1.7.4/src/Hyena/build/Makefile.am
+--- banshee-1-1.7.4.old/src/Hyena/build/Makefile.am	2010-08-11 05:59:06.000000000 +0200
++++ banshee-1-1.7.4/src/Hyena/build/Makefile.am	2010-09-08 00:12:07.000000000 +0200
+@@ -6,7 +6,7 @@
+ ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY = addin-xml-string-extractor.exe
+ GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY = gobject-intptr-ctor-verifier.exe
+ 
+-ALL_TARGETS = $(TRANSLATOR_EXTRACTOR_ASSEMBLY) $(DLL_MAP_VERIFIER_ASSEMBLY) $(ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY) $(GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY)
++ALL_TARGETS = $(DLL_MAP_VERIFIER_ASSEMBLY) $(ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY) $(GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY)
+ 
+ if GCONF_SCHEMAS_INSTALL
+ bansheedir = $(pkglibdir)
+@@ -18,12 +18,6 @@
+ 
+ all: $(ALL_TARGETS)
+ 
+-dnl $(TRANSLATOR_EXTRACTOR_ASSEMBLY): TranslatorExtractor.cs
+-dnl	if [ "x$(top_srcdir)" = "x$(top_builddir)" ]; then \
+-dnl		$(MCS) -out:$@ $< && LC_ALL=en_US.UTF-8 $(MONO) $@ $(top_builddir)/po > \
+-dnl			$(top_srcdir)/src/Core/Banshee.Core/Resources/translators.xml; \
+-dnl	fi;
+-
+ $(DLL_MAP_VERIFIER_ASSEMBLY): DllMapVerifier.cs
+ 	$(MCS) -out:$@ $<
+ 
+diff -uNr banshee-1-1.7.4.old/src/Hyena/build/Makefile.in banshee-1-1.7.4/src/Hyena/build/Makefile.in
+--- banshee-1-1.7.4.old/src/Hyena/build/Makefile.in	2010-08-11 21:43:04.000000000 +0200
++++ banshee-1-1.7.4/src/Hyena/build/Makefile.in	2010-09-08 00:12:27.000000000 +0200
+@@ -388,7 +388,7 @@
+ DLL_MAP_VERIFIER_ASSEMBLY = dll-map-verifier.exe
+ ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY = addin-xml-string-extractor.exe
+ GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY = gobject-intptr-ctor-verifier.exe
+-ALL_TARGETS = $(TRANSLATOR_EXTRACTOR_ASSEMBLY) \
++ALL_TARGETS =  \
+ 	$(DLL_MAP_VERIFIER_ASSEMBLY) \
+ 	$(ADDIN_XML_STRING_EXTRACTOR_ASSEMBLY) \
+ 	$(GOBJECT_INTPTR_CTOR_VERIFIER_ASSEMBLY) $(am__append_1)
+@@ -749,12 +749,6 @@
+ 
+ all: $(ALL_TARGETS)
+ 
+-dnl $(TRANSLATOR_EXTRACTOR_ASSEMBLY): TranslatorExtractor.cs
+-dnl	if [ "x$(top_srcdir)" = "x$(top_builddir)" ]; then \
+-dnl		$(MCS) -out:$@ $< && LC_ALL=en_US.UTF-8 $(MONO) $@ $(top_builddir)/po > \
+-dnl			$(top_srcdir)/src/Core/Banshee.Core/Resources/translators.xml; \
+-dnl	fi;
+-
+ $(DLL_MAP_VERIFIER_ASSEMBLY): DllMapVerifier.cs
+ 	$(MCS) -out:$@ $<
+ 
diff --git a/banshee.spec b/banshee.spec
index 135344e..a08e566 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -7,7 +7,7 @@
 Name:    banshee
 Version: %{mainver}%{?patchver}
 #Release: 0.1.%{gitdate}git%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -27,6 +27,8 @@ Source1: README.Fedora
 # 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
+# build fix, already applied upstream
+Patch3: banshee-1-1.7.4-build.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -147,6 +149,7 @@ developing applications that use %{name}-musicbrainz.
 cp -p %{SOURCE1} .
 %patch1 -p1 -b .no-update-mime-database
 %patch2 -p1 -b .no-update-desktop-database
+%patch3 -p1 -b .build-fix
 
 %build
 export MONO_SHARED_DIR=%mono_shared
@@ -235,6 +238,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Sep 08 2010 Christian Krause <chkr at fedoraproject.org> - 1.7.4-2
+- Add patch to properly comment out some make rules (BZ 631387)
+
 * 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