rpms/f-spot/devel f-spot-0.4.2-GalleryExport.patch, NONE, 1.1 f-spot.spec, 1.63, 1.64

Christopher Aillon (caillon) fedora-extras-commits at redhat.com
Sat Mar 1 08:33:17 UTC 2008


Author: caillon

Update of /cvs/extras/rpms/f-spot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17702

Modified Files:
	f-spot.spec 
Added Files:
	f-spot-0.4.2-GalleryExport.patch 
Log Message:
* Fri Feb 29 2008 Christopher Aillon <caillon at redhat.com> - 0.4.2-3
- Fix the build


f-spot-0.4.2-GalleryExport.patch:

--- NEW FILE f-spot-0.4.2-GalleryExport.patch ---
>From http://bugzilla.gnome.org/show_bug.cgi?id=516620

diff -up f-spot-0.4.2/extensions/GalleryExport/Makefile.am.GalleryExport f-spot-0.4.2/extensions/GalleryExport/Makefile.am
--- f-spot-0.4.2/extensions/GalleryExport/Makefile.am.GalleryExport	2008-03-01 03:28:06.000000000 -0500
+++ f-spot-0.4.2/extensions/GalleryExport/Makefile.am	2008-03-01 03:28:51.000000000 -0500
@@ -36,7 +36,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(
 plugindir = $(pkglibdir)/extensions
 
 install-data-hook:
-	rm -f $(plugindir)/GalleryExport.addin.xml
+	if [ -w $(plugindir)/GalleryExport.addin.xml ] ; then rm -f $(plugindir)/GalleryExport.addin.xml; fi
 
 plugin_DATA =			\
 	$(PLUGIN_ASSEMBLY)
diff -up f-spot-0.4.2/extensions/GalleryExport/Makefile.in.GalleryExport f-spot-0.4.2/extensions/GalleryExport/Makefile.in
--- f-spot-0.4.2/extensions/GalleryExport/Makefile.in.GalleryExport	2008-03-01 03:27:57.000000000 -0500
+++ f-spot-0.4.2/extensions/GalleryExport/Makefile.in	2008-03-01 03:29:16.000000000 -0500
@@ -538,7 +538,7 @@ $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(
 	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
 
 install-data-hook:
-	rm -f $(plugindir)/GalleryExport.addin.xml
+	if [ -w $(plugindir)/GalleryExport.addin.xml ] ; then rm -f $(plugindir)/GalleryExport.addin.xml; fi
 # 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:


Index: f-spot.spec
===================================================================
RCS file: /cvs/extras/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- f-spot.spec	24 Feb 2008 22:11:02 -0000	1.63
+++ f-spot.spec	1 Mar 2008 08:32:43 -0000	1.64
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -9,6 +9,7 @@
 Source0:        f-spot-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=510325
 Patch0:		x-content.patch
+Patch1:         f-spot-0.4.2-GalleryExport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -43,6 +44,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .x-content
+%patch1 -p1 -b .GalleryExport
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -98,6 +100,9 @@
 %{_datadir}/omf/f-spot
 
 %changelog
+* Fri Feb 29 2008 Christopher Aillon <caillon at redhat.com> - 0.4.2-3
+- Fix the build
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.2-2
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list