rpms/mono-addins/devel mono-addins-fix_addin_scan.patch, 1.2, 1.3 .cvsignore, 1.4, 1.5 mono-addins.spec, 1.5, 1.6 sources, 1.4, 1.5

Paul F. Johnson (pfj) fedora-extras-commits at redhat.com
Wed Apr 30 09:56:17 UTC 2008


Author: pfj

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

Modified Files:
	.cvsignore mono-addins.spec sources 
Added Files:
	mono-addins-fix_addin_scan.patch 
Log Message:

Updated version 


mono-addins-fix_addin_scan.patch:

Index: mono-addins-fix_addin_scan.patch
===================================================================
RCS file: mono-addins-fix_addin_scan.patch
diff -N mono-addins-fix_addin_scan.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mono-addins-fix_addin_scan.patch	30 Apr 2008 09:55:42 -0000	1.3
@@ -0,0 +1,19 @@
+#! /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
+
+ at 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Apr 2008 09:48:38 -0000	1.4
+++ .cvsignore	30 Apr 2008 09:55:42 -0000	1.5
@@ -1 +1 @@
-mono-addins-0.3.tar.bz2
+mono-addins-0.3.1.tar.bz2


Index: mono-addins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/mono-addins.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mono-addins.spec	30 Apr 2008 09:48:38 -0000	1.5
+++ mono-addins.spec	30 Apr 2008 09:55:42 -0000	1.6
@@ -1,12 +1,13 @@
 %define debug_package %{nil}
 
 Name:		mono-addins
-Version:	0.3
-Release:	3%{?dist}
+Version:	0.3.1
+Release:	1%{?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,15 @@
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.3.1-1
+- bump (should fix the monodevelop problems)
+
+* 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
+
 * Mon Jan 14 2008 <paul at all-the-johnsons.co.uk> 0.3-3
 - removed debug package
 - spec file fixes


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-addins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Apr 2008 09:48:38 -0000	1.4
+++ sources	30 Apr 2008 09:55:42 -0000	1.5
@@ -1 +1 @@
-d8af0d5c6dabce1aa58efbfd268b6639  mono-addins-0.3.tar.bz2
+bae5e01ba61bd261de2335ab0dfe999f  mono-addins-0.3.1.tar.bz2




More information about the scm-commits mailing list