rpms/boo/FC-6 boo-libdir.patch,NONE,1.1 boo.spec,1.5,1.6

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/boo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27589/FC-6

Modified Files:
	boo.spec 
Added Files:
	boo-libdir.patch 
Log Message:
auto-import boo-0.7.6.2237-12 on branch FC-6 from boo-0.7.6.2237-12.src.rpm

boo-libdir.patch:

--- NEW FILE boo-libdir.patch ---
--- boo-0.7.6.2237/configure.in.in	2005-08-12 18:43:59.000000000 +0100
+++ boo-0.7.6.2237/configure-new.in.in	2006-09-06 22:14:52.000000000 +0100
@@ -14,7 +14,7 @@
 
 AC_PATH_PROG(GACUTIL, gacutil, no)
 
-GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(prefix)/lib'
+GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(libdir)'
 AC_SUBST(GACUTIL_FLAGS)
 
 AC_OUTPUT([
--- boo-0.7.6.2237/bin/Makefile.am	2006-04-04 22:45:36.000000000 +0100
+++ boo-0.7.6.2237/bin/Makefile-new.am	2006-09-06 22:16:36.000000000 +0100
@@ -1,4 +1,4 @@
-boodir = $(prefix)/lib/boo
+boodir = ${libdir}/boo
 boo_DATA = booc.exe booi.exe booish.exe booc.rsp booc.exe.config booi.exe.config booish.exe.config
 
 BOO_GAC_DLLS = Boo.Lang.dll \
--- boo-0.7.6.2237/extras/boo.pc.in	2005-08-12 18:43:45.000000000 +0100
+++ boo-0.7.6.2237/extras/boo-new.pc.in	2006-09-06 22:18:20.000000000 +0100
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=${libdir}
 
 
 Name: Boo
--- boo-0.7.6.2237/extras/Makefile.am	2005-08-12 18:43:45.000000000 +0100
+++ boo-0.7.6.2237/extras/Makefile-new.am	2006-09-06 22:19:03.000000000 +0100
@@ -1,4 +1,4 @@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = boo.pc
 
 gtksourceviewdir = $(GTKSOURCEVIEW_PREFIX)/share/gtksourceview-1.0/language-specs/
--- boo-0.7.6.2237/extras/booish.in	2005-08-12 18:43:45.000000000 +0100
+++ boo-0.7.6.2237/extras/booish-new.in	2006-09-06 22:19:57.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-env @RUNTIME@ @prefix@/lib/boo/booish.exe "$@"
+env @RUNTIME@ ${libdir}/boo/booish.exe "$@"
--- boo-0.7.6.2237/extras/booc.in	2005-08-12 18:43:45.000000000 +0100
+++ boo-0.7.6.2237/extras/booc-new.in	2006-09-06 22:20:45.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-env @RUNTIME@ @prefix@/lib/boo/booc.exe "$@"
+env @RUNTIME@ ${libdir}/boo/booc.exe "$@"
--- boo-0.7.6.2237/extras/booi.in	2005-08-12 18:43:45.000000000 +0100
+++ boo-0.7.6.2237/extras/booi-new.in	2006-09-06 22:21:16.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-env @RUNTIME@ @prefix@/lib/boo/booi.exe "$@"
+env @RUNTIME@ ${libdir}/boo/booi.exe "$@"
--- boo-0.7.6.2237/default.build.libdir	2007-02-11 10:40:57.000000000 +0100
+++ boo-0.7.6.2237/default.build	2007-02-11 10:43:46.000000000 +0100
@@ -108,7 +108,7 @@
 			<copy file="extras/booish.in" tofile="${build.dir}/booish" inputencoding="ASCII">
 				<filterchain>
 					<replacestring from="@RUNTIME@" to="mono" />
-					<replacestring from="@prefix@" to="${install.prefix}" />
+					<replacestring from="@libdir@" to="${install.libdir}" />
 				</filterchain>
 			</copy>
 		</if>
@@ -142,7 +142,7 @@
 			<copy file="extras/booi.in" tofile="${build.dir}/booi" inputencoding="ASCII">
 				<filterchain>
 					<replacestring from="@RUNTIME@" to="mono" />
-					<replacestring from="@prefix@" to="${install.prefix}" />
+					<replacestring from="@libdir@" to="${install.libdir}" />
 				</filterchain>
 			</copy>
 		</if>
@@ -230,7 +230,7 @@
 			<copy file="extras/booc.in" tofile="${build.dir}/booc" inputencoding="ASCII">
 				<filterchain>
 					<replacestring from="@RUNTIME@" to="mono" />
-					<replacestring from="@prefix@" to="${install.prefix}" />
+					<replacestring from="@libdir@" to="${install.libdir}" />
 				</filterchain>
 			</copy>
 		</if>



Index: boo.spec
===================================================================
RCS file: /cvs/extras/rpms/boo/FC-6/boo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- boo.spec	20 Dec 2006 21:34:35 -0000	1.5
+++ boo.spec	11 Feb 2007 13:16:28 -0000	1.6
@@ -7,12 +7,13 @@
 Summary: Boo is an OO statically typed language for CLI
 Name: boo
 Version: 0.7.6.2237
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://boo.codehaus.org
 Source0: http://dist.codehaus.org/boo/distributions/%{name}-%{version}-src.tar.bz2
+Patch0: boo-libdir.patch
 BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant
 
 %description
@@ -30,6 +31,9 @@
 
 %prep
 %setup -q
+%if "%{?fedora}" > "5"
+%patch0 -p1 -b .original
+%endif
 
 %build
 nant -D:install.prefix=%{_prefix} -D:install.libdir=%{monodir}