rpms/mono-tools/devel .cvsignore, 1.4, 1.5 import.log, 1.13, 1.14 mono-tools.spec, 1.18, 1.19 sources, 1.5, 1.6 monotools-2.0-gendarmepc.patch, 1.1, NONE monotools-2.0-infiles.patch, 1.1, NONE monotools-2.2-configure.patch, 1.1, NONE monotools-2.2-gendarme.patch, 1.1, NONE monotools-2.2-makefiles.patch, 1.2, NONE

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3418/devel

Modified Files:
	.cvsignore import.log mono-tools.spec sources 
Removed Files:
	monotools-2.0-gendarmepc.patch monotools-2.0-infiles.patch 
	monotools-2.2-configure.patch monotools-2.2-gendarme.patch 
	monotools-2.2-makefiles.patch 
Log Message:

Updated to svn (fixes a number of issues)
Removed patches and use sed instead 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Nov 2008 11:21:12 -0000	1.4
+++ .cvsignore	15 Dec 2008 12:22:32 -0000	1.5
@@ -1 +1 @@
-mono-tools-2.2.tar.bz2
+mono-tools-121502.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	29 Nov 2008 15:50:05 -0000	1.13
+++ import.log	15 Dec 2008 12:22:33 -0000	1.14
@@ -11,3 +11,4 @@
 mono-tools-2_2-4_pre1_fc11:HEAD:mono-tools-2.2-4.pre1.fc11.src.rpm:1227963909
 mono-tools-2_2-5_pre1_fc11:HEAD:mono-tools-2.2-5.pre1.fc11.src.rpm:1227965375
 mono-tools-2_2-5_pre1_1_fc11:HEAD:mono-tools-2.2-5.pre1.1.fc11.src.rpm:1227973761
+mono-tools-2_2-7_pre2_20081215svn121502_fc11:HEAD:mono-tools-2.2-7.pre2.20081215svn121502.fc11.src.rpm:1229343689


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mono-tools.spec	29 Nov 2008 15:50:05 -0000	1.18
+++ mono-tools.spec	15 Dec 2008 12:22:33 -0000	1.19
@@ -1,17 +1,13 @@
 %define debug_package %{nil}
+%define svnver 121502
 
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.2
-Release: 5.pre1.1%{?dist}
+Release: 7.pre2.20081215svn%{svnver}%{?dist}
 License: MIT
 Group: Development/Tools
-Patch0: monotools-2.2-gendarme.patch
-Patch1: monotools-2.0-gendarmepc.patch
-Patch2: monotools-2.0-infiles.patch
-Patch3: monotools-2.2-makefiles.patch
-Patch4: monotools-2.2-configure.patch
-Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{svnver}.tar.bz2
 URL: http://go-mono.com/sources-latests
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-data, mono-devel >= 2.2, gtk-sharp2-gapi, pkgconfig mono-nunit
@@ -46,43 +42,19 @@
 %define gen gendarme/rules
 
 %prep
-%setup -q 
-sed -i -e 's!@libdir@!%{_libdir}!' %PATCH0 
-sed -i -e 's!@libdir@!%{_libdir}!' %PATCH1
-sed -i -e 's!@libdir@!%{_libdir}!' %PATCH2
-sed -i -e 's!@libdir@!%{_libdir}!' %PATCH3
-sed -i -e 's!@libdir@!%{_libdir}!' %PATCH4
-%patch0 -p1 -b .gendarme
-%patch1 -p1 -b .gendarme-pc
-%patch2 -p1 -b .infiles
-%patch3 -p1 -b .makes
-%patch4 -p1 -b .configure
-sed -i -e 's!%{_libdir}!@libdir@!' %PATCH0
-sed -i -e 's!%{_libdir}!@libdir@!' %PATCH1
-sed -i -e 's!%{_libdir}!@libdir@!' %PATCH2
-sed -i -e 's!%{_libdir}!@libdir@!' %PATCH3
-sed -i -e 's!%{_libdir}!@libdir@!' %PATCH4
-for i in %{gen}/common.make %{gen}/Makefile.{am,in} \
-         %{gen}/Gendarme.Rules.BadPractice/Makefile.in \
-         %{gen}/Gendarme.Rules.Concurrency/Makefile.in \
-         %{gen}/Gendarme.Rules.Correctness/Makefile.in \
-         %{gen}/Gendarme.Rules.Design/Makefile.in \
-         %{gen}/Gendarme.Rules.Design.Generic/Makefile.in \
-         %{gen}/Gendarme.Rules.Design.Linq/Makefile.in \
-         %{gen}/Gendarme.Rules.Exceptions/Makefile.in \
-         %{gen}/Gendarme.Rules.Interoperability/Makefile.in \
-         %{gen}/Gendarme.Rules.Maintainability/Makefile.in \
-         %{gen}/Gendarme.Rules.Naming/Makefile.in \
-         %{gen}/Gendarme.Rules.Performance/Makefile.in \
-         %{gen}/Gendarme.Rules.Portability/Makefile.in \
-         %{gen}/Gendarme.Rules.Security/Makefile.in \
-         %{gen}/Gendarme.Rules.Security.Cas/Makefile.in \
-         %{gen}/Gendarme.Rules.Serialization/Makefile.in \
-         %{gen}/Gendarme.Rules.Smells/Makefile.in \
-         %{gen}/Gendarme.Rules.Ui/Makefile.in \
-; do
-  sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$i"
-done
+%setup -q -n %{name}-%{svnver}
+
+find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+       -or -name \*.make \
+       | while read f ;
+         do
+
+	   sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
+           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+	   sed -i -e 's!$prefix/lib!%{_libdir}!' "$f"
+           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" 
+	   sed -i -e 's!$libdir!%{_libdir}!' "$f" ;
+         done
 
 autoreconf -f -i -s
 chmod 644 COPYING
@@ -119,8 +91,6 @@
 %{_bindir}/ilcontrast
 %{_bindir}/create-native-map
 %{_bindir}/gasnview
-%{_bindir}/gnunit
-%{_bindir}/gnunit2
 %{_bindir}/monodoc
 %{_bindir}/gui-compare
 %{_bindir}/gendarme*
@@ -137,8 +107,6 @@
 %{_libdir}/gui-compare/gui-compare.exe
 %exclude %{_libdir}/gui-compare/*.dll
 %{_libdir}/mono/1.0/gasnview.exe
-%{_libdir}/mono/1.0/gnunit.exe
-%{_libdir}/mono/2.0/gnunit2.exe
 %{_libdir}/monodoc/GeckoHtmlRender.dll
 %{_libdir}/monodoc/GtkHtmlHtmlRender.dll
 %{_libdir}/monodoc/browser.exe
@@ -165,6 +133,13 @@
 %{_libdir}/monodoc/sources/Gendarme*
 
 %changelog
+* Mon Dec 15 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-7.pre2.20081215svn121502
+- Updated to svn
+
+* Sat Dec 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-6.pre2
+- Bump to preview 2
+- use sed to remove the patches
+
 * Sat Nov 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-5.pre1.1
 - Dropped the last patch and sedded it instead
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2008 11:21:13 -0000	1.5
+++ sources	15 Dec 2008 12:22:33 -0000	1.6
@@ -1 +1 @@
-a6f54f3bf46efec04a877f682633d746  mono-tools-2.2.tar.bz2
+73a79f87e3f3646fc064bc1610cb4223  mono-tools-121502.tar.bz2


--- monotools-2.0-gendarmepc.patch DELETED ---


--- monotools-2.0-infiles.patch DELETED ---


--- monotools-2.2-configure.patch DELETED ---


--- monotools-2.2-gendarme.patch DELETED ---


--- monotools-2.2-makefiles.patch DELETED ---