rpms/mono-tools/devel monotools-2.2-gendarme-makes.patch, NONE, 1.1 import.log, 1.10, 1.11 mono-tools.spec, 1.15, 1.16

Paul F. Johnson pfj at fedoraproject.org
Sat Nov 29 13:06:45 UTC 2008 

Author: pfj

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

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

Addition patch for Gendarme makefiles targetting $(prefix)/lib 


monotools-2.2-gendarme-makes.patch:

--- NEW FILE monotools-2.2-gendarme-makes.patch ---
--- mono-tools-2.2/gendarme/rules/common.make	2008-11-13 23:17:57.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/common-new.make	2008-11-29 12:33:42.000000000 +0000
@@ -16,10 +16,10 @@
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
 
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
 
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 
 rules_sources_in = ../../AssemblyInfo.cs.in
--- mono-tools-2.2/gendarme/rules/Makefile.am	2008-11-13 23:17:57.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Makefile-new.am	2008-11-29 12:34:10.000000000 +0000
@@ -24,7 +24,7 @@
 	$(INSTALL) -c -m 0644 $(addprefix $(srcdir)/, rules.xml) $(DESTDIR)$(prefix)/lib/gendarme;
 
 uninstall-hook:
-	rm -f $(DESTDIR)$(prefix)/lib/gendarme/`basename rules.xml`;
+	rm -f $(DESTDIR)$(libdir)/gendarme/`basename rules.xml`;
 
 test:
 	for ASM in $(SUBDIRS); do \
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.BadPractice/Makefile.in	2008-11-29 11:41:15.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.BadPractice/Makefile-new.in	2008-11-29 12:39:04.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Concurrency/Makefile.in	2008-11-29 11:41:15.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Concurrency/Makefile-new.in	2008-11-29 12:39:40.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Correctness/Makefile.in	2008-11-29 11:41:16.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Correctness/Makefile-new.in	2008-11-29 12:40:26.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Design/Makefile.in	2008-11-29 11:41:16.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Design/Makefile-new.in	2008-11-29 12:40:51.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Design.Generic/Makefile.in	2008-11-29 11:41:16.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Design.Generic/Makefile-new.in	2008-11-29 12:41:22.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Design.Linq/Makefile.in	2008-11-29 11:41:16.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Design.Linq/Makefile-new.in	2008-11-29 12:42:15.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Exceptions/Makefile.in	2008-11-29 11:41:17.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Exceptions/Makefile-new.in	2008-11-29 12:42:44.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Interoperability/Makefile.in	2008-11-29 11:41:17.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Interoperability/Makefile-new.in	2008-11-29 12:43:49.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Maintainability/Makefile.in	2008-11-29 11:41:17.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Maintainability/Makefile-new.in	2008-11-29 12:44:58.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Naming/Makefile.in	2008-11-29 11:41:17.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Naming/Makefile-new.in	2008-11-29 12:46:07.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Performance/Makefile.in	2008-11-29 11:41:18.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Performance/Makefile-new.in	2008-11-29 12:46:42.000000000 +0000
@@ -224,9 +224,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Portability/Makefile.in	2008-11-29 11:41:18.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Portability/Makefile-new.in	2008-11-29 12:47:42.000000000 +0000
@@ -223,9 +223,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Security/Makefile.in	2008-11-29 11:41:19.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Security/Makefile-new.in	2008-11-29 12:48:22.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Security.Cas/Makefile.in	2008-11-29 11:41:18.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Security.Cas/Makefile-new.in	2008-11-29 12:49:49.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Serialization/Makefile.in	2008-11-29 11:41:19.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Serialization/Makefile-new.in	2008-11-29 12:50:16.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Smells/Makefile.in	2008-11-29 11:41:19.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Smells/Makefile-new.in	2008-11-29 12:50:43.000000000 +0000
@@ -224,9 +224,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)
--- mono-tools-2.2/gendarme/rules/Gendarme.Rules.Ui/Makefile.in	2008-11-29 11:41:19.000000000 +0000
+++ mono-tools-2.2/gendarme/rules/Gendarme.Rules.Ui/Makefile-new.in	2008-11-29 12:51:47.000000000 +0000
@@ -222,9 +222,9 @@
 rules_doc_source = doc/$(prefixed_rules_category).source
 rules_doc_tree = doc/$(prefixed_rules_category).tree
 rules_doc_zip = doc/$(prefixed_rules_category).zip
-rules_categorydir = $(prefix)/lib/gendarme
+rules_categorydir = $(libdir)/gendarme
 rules_category_SCRIPTS = $(rules_dll)
-rules_documentationdir = $(prefix)/lib/monodoc/sources
+rules_documentationdir = $(libdir)/monodoc/sources
 rules_documentation_DATA = $(rules_doc)
 rules_sources_in = ../../AssemblyInfo.cs.in
 rules_generated_sources = $(rules_sources_in:.in=)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	29 Nov 2008 11:54:31 -0000	1.10
+++ import.log	29 Nov 2008 13:06:14 -0000	1.11
@@ -8,3 +8,4 @@
 mono-tools-2_2-1_pre1_fc10:HEAD:mono-tools-2.2-1.pre1.fc10.src.rpm:1227698424
 mono-tools-2_2-2_pre1_fc10:HEAD:mono-tools-2.2-2.pre1.fc10.src.rpm:1227701285
 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


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mono-tools.spec	29 Nov 2008 11:54:31 -0000	1.15
+++ mono-tools.spec	29 Nov 2008 13:06:14 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.2
-Release: 3.pre1%{?dist}
+Release: 4.pre1%{?dist}
 License: MIT
 Group: Development/Tools
 Patch0: monotools-2.2-gendarme.patch
@@ -11,6 +11,7 @@
 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)
@@ -55,6 +56,7 @@
 %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
@@ -141,6 +143,9 @@
 %{_libdir}/monodoc/sources/Gendarme*
 
 %changelog
+* Sat Nov 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-4.pre1
+- More patches
+
 * Sat Nov 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-3.pre1
 - actually apply the configure patch helps...

More information about the fedora-extras-commits mailing list