From e9ae4527439cc141dea6b3d327c8c4bb86356788 Mon Sep 17 00:00:00 2001 From: Paul F. Johnson Date: Nov 29 2008 13:31:02 +0000 Subject: More patches. Oh for the day when the mono folks use $(libdir) instead of a mix of $(prefix)/lib and $(libdir) --- diff --git a/import.log b/import.log index b319691..b612d6f 100644 --- a/import.log +++ b/import.log @@ -9,3 +9,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 +mono-tools-2_2-5_pre1_fc11:HEAD:mono-tools-2.2-5.pre1.fc11.src.rpm:1227965375 diff --git a/mono-tools.spec b/mono-tools.spec index 3f5d225..2662f62 100644 --- a/mono-tools.spec +++ b/mono-tools.spec @@ -3,7 +3,7 @@ Summary: A collection of tools for mono applications Name: mono-tools Version: 2.2 -Release: 4.pre1%{?dist} +Release: 5.pre1%{?dist} License: MIT Group: Development/Tools Patch0: monotools-2.2-gendarme.patch @@ -143,6 +143,9 @@ desktop-file-install --vendor fedora \ %{_libdir}/monodoc/sources/Gendarme* %changelog +* Sat Nov 29 2008 Paul F. Johnson - 2.2-5.pre1 +- More patches. Crumbs - why can't these guys just use $(libdir)? + * Sat Nov 29 2008 Paul F. Johnson - 2.2-4.pre1 - More patches diff --git a/monotools-2.2-gendarme-makes.patch b/monotools-2.2-gendarme-makes.patch index f5e783b..e606605 100644 --- a/monotools-2.2-gendarme-makes.patch +++ b/monotools-2.2-gendarme-makes.patch @@ -262,3 +262,18 @@ rules_documentation_DATA = $(rules_doc) rules_sources_in = ../../AssemblyInfo.cs.in rules_generated_sources = $(rules_sources_in:.in=) +--- mono-tools-2.2/gendarme/rules/Makefile.in 2008-11-17 17:01:20.000000000 +0000 ++++ mono-tools-2.2/gendarme/rules/Makefile-new.in 2008-11-29 13:22:55.000000000 +0000 +@@ -526,10 +526,10 @@ + + + install-data-hook: +- $(INSTALL) -c -m 0644 $(addprefix $(srcdir)/, rules.xml) $(DESTDIR)$(prefix)/lib/gendarme; ++ $(INSTALL) -c -m 0644 $(addprefix $(srcdir)/, rules.xml) $(DESTDIR)$(libdir)/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 \