rpms/mono-addins/devel mono-addins-fix_addin_scan.patch, NONE, 1.1 mono-addins.spec, 1.2, 1.3

[Alex Lancaster (alexlan)]

Author: alexlan

Update of /cvs/pkgs/rpms/mono-addins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv437

Modified Files:
	mono-addins.spec 
Added Files:
	mono-addins-fix_addin_scan.patch 
Log Message:
- Add patch from Debian to make sure addins don't disappear in f-spot (#442343)


mono-addins-fix_addin_scan.patch:

--- NEW FILE mono-addins-fix_addin_scan.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix_addin_scan.dpatch by Tim Retout <tim at retout.co.uk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix from upstream SVN r95443 for addin scan issue. Closes: #459649

@DPATCH@
diff -urNad mono-addins~/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
--- mono-addins~/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs	2008-01-30 22:37:53.000000000 +0000
+++ mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs	2008-03-20 16:46:40.000000000 +0000
@@ -512,6 +512,8 @@
 						string dir = Path.GetDirectoryName (mp);
 						string pat = Path.GetFileName (mp);
 						foreach (string fmp in fileDatabase.GetDirectoryFiles (dir, pat)) {
+							if (files.Contains (fmp))
+								continue;
 							files.Add (fmp);
 							string an = Path.GetFileNameWithoutExtension (fmp);
 							changedAddins [an] = an;


Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/mono-addins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mono-addins.spec	19 Feb 2008 18:52:39 -0000	1.2
+++ mono-addins.spec	16 Apr 2008 01:18:23 -0000	1.3
@@ -2,11 +2,12 @@
 
 Name:		mono-addins
 Version:	0.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	GPLv2
 Patch0:		mono-addins.patch
+Patch1:		mono-addins-fix_addin_scan.patch
 URL:		http://www.mono-project.com/
 Source0:	%{name}-%{version}.tar.bz2	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .fix_addin_scan
 autoreconf -f -i -s
 
 %build
@@ -60,6 +62,9 @@
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Tue Apr 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.3-5
+- Add patch from Debian to make sure addins don't disappear in f-spot (#442343)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.3-4
 - Autorebuild for GCC 4.3