rpms/nant/devel nant-app.patch, NONE, 1.1 nant-build.patch, NONE, 1.1 nant-exe.patch, NONE, 1.1 nant-libdir.patch, 1.1, 1.2 nant.spec, 1.2, 1.3 needs.rebuild, 1.1, NONE
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Sat Sep 16 00:55:04 UTC 2006
- Previous message: rpms/nant import.log,1.4,1.5
- Next message: rpms/gnome-sudoku/FC-5 gnome-sudoku-0.5.0-gtk-noload.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnome-sudoku.spec, 1.11, 1.12 sources, 1.3, 1.4 gnome-sudoku-0.4.0-pygtk2-nofs.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pfj
Update of /cvs/extras/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7473/devel
Modified Files:
nant-libdir.patch nant.spec
Added Files:
nant-app.patch nant-build.patch nant-exe.patch
Removed Files:
needs.rebuild
Log Message:
auto-import nant-0.85-7 on branch devel from nant-0.85-7.src.rpm
nant-app.patch:
--- NEW FILE nant-app.patch ---
--- nant-0.85-rc4/src/NAnt.Console/App.config 2006-04-24 13:18:36.000000000 +0100
+++ nant-0.85-rc4/src/NAnt.Console/App-new.config 2006-09-16 00:07:39.000000000 +0100
@@ -1318,7 +1318,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/1.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/1.0')}"
clrversion="1.1.4322"
>
<task-assemblies>
@@ -1338,7 +1338,7 @@
<property name="csc.supportsdocgeneration" value="false" />
</if>
<if test="${pkg-config::is-atleast-version('mono', '1.1')}">
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<property name="resgen.tool" value="resgen" />
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -1349,7 +1349,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1359,7 +1359,7 @@
<attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -1387,7 +1387,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50727"
>
<task-assemblies>
@@ -1416,9 +1416,9 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -1432,7 +1432,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1443,7 +1443,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -1471,7 +1471,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50215"
>
<task-assemblies>
@@ -1500,9 +1500,9 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -1516,7 +1516,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1527,7 +1527,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -1555,7 +1555,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.40607"
>
<task-assemblies>
@@ -1584,9 +1584,9 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -1600,7 +1600,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1611,7 +1611,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
nant-build.patch:
--- NEW FILE nant-build.patch ---
--- nant-0.85-rc4/NAnt.build 2006-06-02 20:07:52.000000000 +0100
+++ nant-0.85-rc4/NAnt-new.build 2006-09-16 00:56:44.000000000 +0100
@@ -807,13 +807,14 @@
</target>
<target name="install-linux" depends="build" if="${platform::is-unix()}">
- <property name="install.realprefix" value="/usr/local" />
+ <property name="install.realprefix" value="@BUILDROOT@" />
<if test="${property::exists('install.prefix') and string::get-length(install.prefix) != 0}">
<property name="install.realprefix" value="${install.prefix}" />
</if>
<property name="install.bindir" value="${path::combine(install.realprefix, 'bin')}"/>
- <property name="install.share" value="${path::combine(install.realprefix, 'share')}"/>
- <property name="install.copylocation" value="${path::combine (install.share, 'NAnt')}"/>
+ <property name="install.libdir" value="${path::combine(install.realprefix, '@LIB@')}"/>
+ <property name="install.share" value="${path::combine(install.realprefix, '@LIB@')}"/>
+ <property name="install.copylocation" value="${path::combine(install.libdir, 'NAnt')}"/>
<property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}"/>
<echo message="Installing NAnt to '${install.copylocation}' ..." />
nant-exe.patch:
--- NEW FILE nant-exe.patch ---
--- bootstrap/NAnt.exe.config 2006-09-15 22:36:37.000000000 +0100
+++ bootstrap/NAnt-new.exe.config 2006-09-15 22:45:31.000000000 +0100
@@ -1338,7 +1338,7 @@
<property name="csc.supportsdocgeneration" value="false" />
</if>
<if test="${pkg-config::is-atleast-version('mono', '1.1')}">
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<property name="resgen.tool" value="resgen" />
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -1349,7 +1349,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1359,7 +1359,7 @@
<attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -1387,7 +1387,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50727"
>
<task-assemblies>
@@ -1416,9 +1416,9 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -1432,7 +1432,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1443,7 +1443,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -1471,7 +1471,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.50215"
>
<task-assemblies>
@@ -1500,9 +1500,9 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -1516,7 +1516,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1527,7 +1527,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -1555,7 +1555,7 @@
runtimeengine="${path::combine(prefix, 'bin/mono')}"
sdkdirectory="${frameworkdirectory}"
frameworkdirectory="${frameworkdirectory}"
- frameworkassemblydirectory="${path::combine(prefix, 'lib/mono/2.0')}"
+ frameworkassemblydirectory="${path::combine(prefix, '@LIBDIR@/mono/2.0')}"
clrversion="2.0.40607"
>
<task-assemblies>
@@ -1584,9 +1584,9 @@
for the 2.0 profile, for the other tools we should
use the 1.0 profile version
-->
- <property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
+ <property name="frameworkdirectory" value="${path::combine(prefix, '@LIBDIR@/mono/1.0')}" />
<!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
- <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <property name="resgen.tool" value="${path::combine(prefix, '@LIBDIR@/mono/2.0/resgen.exe')}" />
<if test="${not file::exists(resgen.tool)}">
<!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
<property name="resgen.tool" value="resgen" />
@@ -1600,7 +1600,7 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/2.0/gmcs.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
@@ -1611,7 +1611,7 @@
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${path::combine(prefix, '@LIBDIR@/mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
nant-libdir.patch:
Index: nant-libdir.patch
===================================================================
RCS file: /cvs/extras/rpms/nant/devel/nant-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nant-libdir.patch 9 Jul 2006 22:00:04 -0000 1.1
+++ nant-libdir.patch 16 Sep 2006 00:55:03 -0000 1.2
@@ -1,13 +1,17 @@
---- NAnt.build.orig 2006-06-02 14:07:52.000000000 -0500
-+++ NAnt.build 2006-07-08 13:35:20.000000000 -0500
-@@ -813,7 +813,9 @@
- </if>
- <property name="install.bindir" value="${path::combine(install.realprefix, 'bin')}"/>
- <property name="install.share" value="${path::combine(install.realprefix, 'share')}"/>
-- <property name="install.copylocation" value="${path::combine (install.share, 'NAnt')}"/>
-+ <property name="install.libdir" value="${path::combine(install.realprefix, '@LIB@')}"/>
-+ <!-- <property name="install.copylocation" value="${path::combine (install.share, 'NAnt')}"/> -->
-+ <property name="install.copylocation" value="${path::combine (install.libdir, 'NAnt')}"/>
- <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}"/>
- <echo message="Installing NAnt to '${install.copylocation}' ..." />
-
+--- nant-0.85-rc4/Makefile 2005-12-11 08:47:54.000000000 +0000
++++ nant-0.85-rc4/Makefile-new 2006-09-16 00:02:34.000000000 +0100
+@@ -34,12 +34,14 @@
+ all: bootstrap build-nant
+
+ build-nant:
++ patch -p1 bootstrap/NAnt.exe.config < nant-exe.patch
+ $(NANT) -f:NAnt.build build
+
+ clean:
+ rm -fR build bootstrap
+
+ install: bootstrap
++ patch -p1 bootstrap/NAnt.exe.config nant-app.patch
+ $(NANT) -f:NAnt.build install -D:install.prefix="$(prefix)"
+
+ run-test: bootstrap
Index: nant.spec
===================================================================
RCS file: /cvs/extras/rpms/nant/devel/nant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nant.spec 19 Jul 2006 21:56:35 -0000 1.2
+++ nant.spec 16 Sep 2006 00:55:03 -0000 1.3
@@ -1,12 +1,23 @@
%define extra rc4
%define debug_package %{nil}
+%if "%{?fedora}" == "5"
+%define monodir %{_prefix}/lib
+%define mlib lib
+%else
+%define monodir %{_libdir}
+%define mlib %{_lib}
+%endif
+
Summary: NAnt is a build tool for Mono and .NET
Name: nant
Version: 0.85
-Release: 6%{?dist}
+Release: 7%{?dist}
Source0: http://download.sourceforge.net/nant/%{name}-%{version}-%{extra}-src.tar.gz
+Source1: nant-exe.patch
+Source2: nant-app.patch
Patch0: nant-libdir.patch
+Patch1: nant-build.patch
License: GPL
Group: Development/Tools
Url: http://nant.sourceforge.net/
@@ -29,9 +40,16 @@
%prep
%setup -q -n %{name}-%{version}-%{extra}
-%patch0
-# put nant into libdir
+%if "%{?fedora}" > "5"
+%patch0 -p1 -b .orig
+cp %{SOURCE1} nant-exe.patch
+cp %{SOURCE2} nant-app.patch
+sed -i -e "s/@LIBDIR@/%{mlib}/" nant-exe.patch
+sed -i -e "s/@LIBDIR@/%{mlib}/" nant-app.patch
+%endif
+%patch1 -p1 -b .orig
sed -i -e "s/@LIB@/%{_lib}/" NAnt.build
+sed -i -e "s!@BUILDROOT@!%{buildroot}/usr!" NAnt.build
find . -type d|xargs chmod 755
find . -type f|xargs chmod 644
sed -i 's/\r//' doc/license.html
@@ -40,12 +58,12 @@
sed -i 's/\r//' doc/releasenotes.html
%build
-export MONO_PATH=%{buildroot}/lib
+export MONO_PATH=%{buildroot}/%{mlib}
make
%install
rm -rf %{buildroot}
-%makeinstall
+make DESTDIR=%{buildroot} install
sed -i -e "s#%{buildroot}##" %{buildroot}%{_bindir}/%{name}
find examples -name \*.dll -o -name \*.exe|xargs rm -f
rm -rf %{buildroot}%{_datadir}/NAnt/doc
@@ -63,15 +81,16 @@
%defattr(-,root,root)
%doc README.txt doc/*.html COPYING.txt
%{_bindir}/nant
-# libdir is not showing lib64 for some reason
-#%{_exec_prefix}/%{_lib}/NAnt/
-%{_libdir}/NAnt/
+%{monodir}/NAnt/
%files docs
%defattr(-,root,root,-)
%doc examples/* doc/help/*
%changelog
+* Wed Sep 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.85-7
+- FC5 and FC6 fixes (libdir)
+
* Wed Jul 19 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.85-6
- Security fix to spec file
- Other spec file fixes
--- needs.rebuild DELETED ---
- Previous message: rpms/nant import.log,1.4,1.5
- Next message: rpms/gnome-sudoku/FC-5 gnome-sudoku-0.5.0-gtk-noload.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnome-sudoku.spec, 1.11, 1.12 sources, 1.3, 1.4 gnome-sudoku-0.4.0-pygtk2-nofs.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list