rpms/mono-tools/devel import.log, 1.12, 1.13 mono-tools.spec, 1.17, 1.18 monotools-2.2-gendarme-makes.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-serv13030/devel

Modified Files:
	import.log mono-tools.spec 
Removed Files:
	monotools-2.2-gendarme-makes.patch 
Log Message:

Dropped patch 5 and used sed instead (less headaches) 



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	29 Nov 2008 13:31:02 -0000	1.12
+++ import.log	29 Nov 2008 15:50:05 -0000	1.13
@@ -10,3 +10,4 @@
 mono-tools-2_2-3_pre1_fc11:HEAD:mono-tools-2.2-3.pre1.fc11.src.rpm:1227959567
 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


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mono-tools.spec	29 Nov 2008 13:31:02 -0000	1.17
+++ mono-tools.spec	29 Nov 2008 15:50:05 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.2
-Release: 5.pre1%{?dist}
+Release: 5.pre1.1%{?dist}
 License: MIT
 Group: Development/Tools
 Patch0: monotools-2.2-gendarme.patch
@@ -11,7 +11,6 @@
 Patch2: monotools-2.0-infiles.patch
 Patch3: monotools-2.2-makefiles.patch
 Patch4: monotools-2.2-configure.patch
-Patch5: monotools-2.2-gendarme-makes.patch
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
 URL: http://go-mono.com/sources-latests
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +43,8 @@
 %description monodoc
 Documentation for monotools for use with monodoc
 
+%define gen gendarme/rules
+
 %prep
 %setup -q 
 sed -i -e 's!@libdir@!%{_libdir}!' %PATCH0 
@@ -56,12 +57,33 @@
 %patch2 -p1 -b .infiles
 %patch3 -p1 -b .makes
 %patch4 -p1 -b .configure
-%patch5 -p1 -b .gendarme-makes
 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
+
 autoreconf -f -i -s
 chmod 644 COPYING
 
@@ -143,6 +165,9 @@
 %{_libdir}/monodoc/sources/Gendarme*
 
 %changelog
+* 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
+
 * Sat Nov 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-5.pre1
 - More patches. Crumbs - why can't these guys just use $(libdir)?
 


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