[f-spot] - Add patch to properly comment out some make rules (BZ 631287)

[chkr]

commit e20bb3f7f483ff61e0f95ec32a18baad61633c3c
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Wed Sep 8 00:11:40 2010 +0200

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

 f-spot-0.7.2-build.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++
 f-spot.spec              |    8 ++++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/f-spot-0.7.2-build.patch b/f-spot-0.7.2-build.patch
new file mode 100644
index 0000000..bda29c4
--- /dev/null
+++ b/f-spot-0.7.2-build.patch
@@ -0,0 +1,50 @@
+diff -uNr f-spot-0.7.2.old/lib/Hyena/build/Makefile.am f-spot-0.7.2/lib/Hyena/build/Makefile.am
+--- f-spot-0.7.2.old/lib/Hyena/build/Makefile.am	2010-08-09 15:46:27.000000000 +0200
++++ f-spot-0.7.2/lib/Hyena/build/Makefile.am	2010-09-08 00:07:48.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 f-spot-0.7.2.old/lib/Hyena/build/Makefile.in f-spot-0.7.2/lib/Hyena/build/Makefile.in
+--- f-spot-0.7.2.old/lib/Hyena/build/Makefile.in	2010-08-10 13:36:07.000000000 +0200
++++ f-spot-0.7.2/lib/Hyena/build/Makefile.in	2010-09-08 00:08:11.000000000 +0200
+@@ -348,7 +348,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)
+@@ -758,12 +758,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/f-spot.spec b/f-spot.spec
index c17b207..3685074 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,12 +1,14 @@
 Name:           f-spot
 Version:        0.7.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.7/f-spot-%{version}.tar.bz2
+# build fix, already applied upstream
+Patch2:         f-spot-0.7.2-build.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
 
@@ -69,6 +71,7 @@ photo collection in a slideshow as a screensaver.
 
 %prep
 %setup -q
+%patch2 -p1 -b .build-fix
 %patch3 -p1 -b .gvfs-gphoto
 
 %build
@@ -150,6 +153,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Tue Sep 07 2010 Christian Krause <chkr at fedoraproject.org> - 0.7.2-2
+- Add patch to properly comment out some make rules (BZ 631287)
+
 * Sat Aug 14 2010 Christian Krause <chkr at fedoraproject.org> - 0.7.2-1
 - Update to 0.7.2
 - Removed upstreamed patches