[nant] Change paths for mono assemblies according to updated packaging guidelines (http://fedoraproject.org

[Christian Krause]

commit b471dd4d9b165791a7964b9789814346241bd7cb
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sun Nov 20 19:37:10 2011 +0100

    Change paths for mono assemblies according to updated packaging
    guidelines (http://fedoraproject.org/wiki/Packaging:Mono)

 nant.spec |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/nant.spec b/nant.spec
index 26fe91c..9572cd4 100644
--- a/nant.spec
+++ b/nant.spec
@@ -1,12 +1,11 @@
 %global debug_package %{nil}
-%global monodir %{_libdir}
-%global mlib %{_lib}
-%global bootstrap 0
+%global monodir %{_prefix}/lib
+%global bootstrap 1
 
 Summary: NAnt is a build tool for Mono and .NET
 Name: nant
 Version: 0.90
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 Source0: http://downloads.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
 Patch1: nant-0.90-no_ndoc.patch
@@ -33,9 +32,9 @@ ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
 %if 0%{bootstrap}
 # In bootstrap mode, filter requires of the prebuilt DLLs. Some of these
 # require older mono runtime, creating broken rpm deps.
-%filter_requires_in %{_libdir}/NAnt/
+%filter_requires_in %{_prefix}/lib/NAnt/
 # Also filter provides of the prebuilt DLLs
-%filter_provides_in %{_libdir}/NAnt/
+%filter_provides_in %{_prefix}/lib/NAnt/
 %filter_setup
 %endif
 
@@ -63,10 +62,8 @@ Development file for %{name}
 %setup -q -n %{name}-%{version}
 
 # install to libdir instead of datadir
-sed -i -e "/property name=\"install\.share\"/ s/'share'/'%{_lib}'/" \
-       -e "/property name=\"install\.pkgconfigdir\"/ s,'lib/pkgconfig','%{_lib}/pkgconfig'," NAnt.build
-sed -i -e "s,lib/,%{_lib}/,g" src/NAnt.Console/App.config
-sed -i -e "s,/share/,/%{_lib}/," etc/nant.pc.in
+sed -i -e "/property name=\"install\.share\"/ s/'share'/'lib'/" NAnt.build
+sed -i -e "s,/share/,/lib/," etc/nant.pc.in
 
 # Remove NDoc support
 %patch1 -p1 -b .no_ndoc
@@ -124,10 +121,13 @@ rm -rf %{buildroot}%{_datadir}/NAnt/doc
 %if 0%{bootstrap}
 # Do nothing
 %else
-rm -rf %{buildroot}%{_libdir}/NAnt/bin/lib
-rm -rf %{buildroot}%{_libdir}/NAnt/bin/log4net.dll
+rm -rf %{buildroot}%{_prefix}/lib/NAnt/bin/lib
+rm -rf %{buildroot}%{_prefix}/lib/NAnt/bin/log4net.dll
 %endif
 
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgconfig/* $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+
 %clean
 rm -rf %{buildroot}
 
@@ -152,6 +152,10 @@ scrollkeeper-update -q || :
 %{_libdir}/pkgconfig/nant.pc
 
 %changelog
+* Sun Nov 20 2011 Christian Krause <chkr at fedoraproject.org> - 1:0.90-7
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Tue Apr 19 2011 Dan Horák <dan[at]danny.cz> - 1:0.90-6
 - updated the supported arch list