rpms/mono-tools/devel monotools-2.2-configure.patch, NONE, 1.1 import.log, 1.8, 1.9 mono-tools.spec, 1.13, 1.14 monotools-2.2-makefiles.patch, 1.1, 1.2

[Paul F. Johnson]

Author: pfj

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

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

libdir fixes 


monotools-2.2-configure.patch:

--- NEW FILE monotools-2.2-configure.patch ---
--- mono-tools-2.2/configure	2008-11-25 15:10:48.000000000 +0000
+++ mono-tools-2.2/configure-new	2008-11-26 11:43:38.000000000 +0000
@@ -860,7 +860,7 @@
 dvidir='${docdir}'
 pdfdir='${docdir}'
 psdir='${docdir}'
-libdir='${exec_prefix}/lib'
+libdir=@libdir@
 localedir='${datarootdir}/locale'
 mandir='${datarootdir}/man'
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	26 Nov 2008 11:21:13 -0000	1.8
+++ import.log	26 Nov 2008 12:08:52 -0000	1.9
@@ -6,3 +6,4 @@
 mono-tools-2_0-5_fc10:HEAD:mono-tools-2.0-5.fc10.src.rpm:1221075751
 mono-tools-2_0-7_fc10:HEAD:mono-tools-2.0-7.fc10.src.rpm:1222991858
 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


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mono-tools.spec	26 Nov 2008 11:21:13 -0000	1.13
+++ mono-tools.spec	26 Nov 2008 12:08:52 -0000	1.14
@@ -3,13 +3,14 @@
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.2
-Release: 1.pre1%{?dist}
+Release: 2.pre1%{?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
 URL: http://go-mono.com/sources-latests
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +49,7 @@
 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
@@ -56,6 +58,7 @@
 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
 autoreconf -f -i -s
 chmod 644 COPYING
 
@@ -137,6 +140,9 @@
 %{_libdir}/monodoc/sources/Gendarme*
 
 %changelog
+* Wed Nov 26 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-2.pre1
+- added configure patch
+
 * Thu Nov 20 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-1.pre1
 - bump to 2.2 preview 1
 - fix patch files

monotools-2.2-makefiles.patch:

Index: monotools-2.2-makefiles.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/monotools-2.2-makefiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monotools-2.2-makefiles.patch	26 Nov 2008 11:21:13 -0000	1.1
+++ monotools-2.2-makefiles.patch	26 Nov 2008 12:08:52 -0000	1.2
@@ -29,4 +29,48 @@
  assembly_DATA = $(EXE) MapAttribute.cs
  
  check: $(PROGRAM) TestMap.dll
-
+--- mono-tools-2.2/docbrowser/Makefile.am	2008-11-13 23:17:58.000000000 +0000
++++ mono-tools-2.2/docbrowser/Makefile-new.am	2008-11-26 11:54:15.000000000 +0000
+@@ -1,4 +1,4 @@
+-monodocdir=$(prefix)/lib/monodoc
++monodocdir=$(libdir)/monodoc
+ 
+ if ENABLE_GTKHTML
+ noinst_DATA = admin.exe
+--- mono-tools-2.2/gnunit/src/Makefile.am	2008-08-12 17:23:37.000000000 +0100
++++ mono-tools-2.2/gnunit/src/Makefile-new.am	2008-11-26 11:57:02.000000000 +0000
+@@ -11,8 +11,8 @@
+ 
+ gnunit_SCRIPTS = gnunit.exe
+ gnunit2_SCRIPTS = gnunit2.exe
+-gnunit2dir = $(prefix)/lib/mono/2.0
+-gnunitdir = $(prefix)/lib/mono/1.0
++gnunit2dir = $(libdir)/mono/2.0
++gnunitdir = $(libdir)/mono/1.0
+ 
+ CLEANFILES = gnunit.exe gnunit.exe.mdb gnunit2.exe gnunit2.exe.mdb gnunit gnunit2
+ EXTRA_DIST = $(gnunit_sources_dist) nunit-gtk.glade script.in script2.in
+--- mono-tools-2.2/gsharp/Makefile.am	2008-11-13 23:17:58.000000000 +0000
++++ mono-tools-2.2/gsharp/Makefile-new.am	2008-11-26 11:58:03.000000000 +0000
+@@ -1,4 +1,4 @@
+-gsharpdir = $(prefix)/lib/gsharp
++gsharpdir = $(libdir)/gsharp
+ bin_SCRIPTS = gsharp
+ 
+ gsharp_DATA = gsharp.exe
+--- mono-tools-2.2/gui-compare/Makefile.am	2008-08-12 17:23:40.000000000 +0100
++++ mono-tools-2.2/gui-compare/Makefile-new.am	2008-11-26 11:58:54.000000000 +0000
+@@ -1,4 +1,4 @@
+-guicomparedir=$(prefix)/lib/gui-compare
++guicomparedir=$(libdir)/gui-compare
+ bin_SCRIPTS = gui-compare
+ guicompare_DATA = gui-compare.exe Mono.Cecil.dll
+ 
+--- mono-tools-2.2/mperfmon/Makefile.am	2008-11-13 23:17:58.000000000 +0000
++++ mono-tools-2.2/mperfmon/Makefile-new.am	2008-11-26 12:00:56.000000000 +0000
+@@ -1,4 +1,4 @@
+-mperfmondir=$(prefix)/lib/mperfmon
++mperfmondir=$(libdir)/mperfmon
+ bin_SCRIPTS = mperfmon
+ mperfmon_DATA = mperfmon.exe config
+ man_MANS=mperfmon.1