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

Christian Krause chkr at fedoraproject.org
Tue Oct 25 21:17:54 UTC 2011


commit 8bfed6ca36ae6aa1684d0c170840c49eda1e17b4
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Tue Oct 25 23:17:51 2011 +0200

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

 mono-tools.spec |   72 +++++++++++++++++++++++++-----------------------------
 1 files changed, 33 insertions(+), 39 deletions(-)
---
diff --git a/mono-tools.spec b/mono-tools.spec
index 5819c46..c717b29 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.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: http://ftp.novell.com/pub/mono/sources/mono-tools/%{name}-%{version}.tar.bz2
@@ -42,23 +42,10 @@ Documentation for monotools for use with monodoc
 
 %prep
 %setup -q 
-
-find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
-       -or -name \*.make -or -name \*.in \
-       | while read f ;
-         do
-           sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
-           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
-           sed -i -e 's!$prefix/lib!%{_libdir}!' "$f"
-           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" 
-           sed -i -e 's!$libdir!%{_libdir}!' "$f" ;
-         done
-
-autoreconf -f -i -s
 chmod 644 COPYING
 
 %build
-%configure
+%configure --libdir=%{_prefix}/lib
 make 
 # no smp flags - breaks the build
 
@@ -77,6 +64,9 @@ desktop-file-install --vendor fedora \
         --delete-original \
         %{buildroot}%{_datadir}/applications/monodoc.desktop
 
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+test "%{_libdir}" = "%{_prefix}/lib" || mv %{buildroot}%{_prefix}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
+
 %find_lang %{name}
 
 %post
@@ -102,32 +92,32 @@ update-desktop-database &> /dev/null || :
 %{_bindir}/gui-compare
 %{_bindir}/emveepee
 %{_bindir}/minvoke
-%{_libdir}/gsharp/gsharp.exe*
-%{_libdir}/gendarme/*.dll
-%{_libdir}/gendarme/*.exe
-%{_libdir}/gendarme/*.xml
-%{_libdir}/create-native-map
-%{_libdir}/mperfmon/*
-%dir %{_libdir}/gui-compare
-%{_libdir}/gui-compare/gui-compare.exe*
-%{_libdir}/mono/1.0/gasnview.exe
-%{_libdir}/monodoc/WebKitHtmlRender.dll
-%{_libdir}/monodoc/browser.exe
-%{_libdir}/minvoke/minvoke.exe
-%dir %{_libdir}/minvoke
-%dir %{_libdir}/ilcontrast
-%{_libdir}/ilcontrast/ilcontrast.exe
-%dir %{_libdir}/mono-tools
-%{_libdir}/mono-tools/mprof*
-%{_libdir}/mono-tools/Mono.Profiler.Widgets*
-%{_libdir}/mono-tools/emveepee.exe*
+%{_prefix}/lib/gsharp/gsharp.exe*
+%{_prefix}/lib/gendarme/*.dll
+%{_prefix}/lib/gendarme/*.exe
+%{_prefix}/lib/gendarme/*.xml
+%{_prefix}/lib/create-native-map
+%{_prefix}/lib/mperfmon/*
+%dir %{_prefix}/lib/gui-compare
+%{_prefix}/lib/gui-compare/gui-compare.exe*
+%{_prefix}/lib/mono/1.0/gasnview.exe
+%{_prefix}/lib/monodoc/WebKitHtmlRender.dll
+%{_prefix}/lib/monodoc/browser.exe
+%{_prefix}/lib/minvoke/minvoke.exe
+%dir %{_prefix}/lib/minvoke
+%dir %{_prefix}/lib/ilcontrast
+%{_prefix}/lib/ilcontrast/ilcontrast.exe
+%dir %{_prefix}/lib/mono-tools
+%{_prefix}/lib/mono-tools/mprof*
+%{_prefix}/lib/mono-tools/Mono.Profiler.Widgets*
+%{_prefix}/lib/mono-tools/emveepee.exe*
 %{_mandir}/man1/mprof*
 %{_mandir}/man1/create-native-map.1.gz
 %{_datadir}/pixmaps/ilcontrast.png
 %{_datadir}/pixmaps/monodoc.png
 %{_datadir}/pixmaps/gendarme.svg
 %{_datadir}/applications/*.desktop
-%{_libdir}/monodoc/MonoWebBrowserHtmlRender.dll
+%{_prefix}/lib/monodoc/MonoWebBrowserHtmlRender.dll
 %{_mandir}/man1/gendarme*
 %{_mandir}/man1/mperfmon*
 %{_mandir}/man1/gd2i*
@@ -139,13 +129,17 @@ update-desktop-database &> /dev/null || :
 
 %files monodoc
 %defattr(-,root,root,-)
-%{_libdir}/monodoc/sources/Gendarme*
-%{_libdir}/monodoc/sources/gendarme*
-%dir %{_libdir}/monodoc/web
-%{_libdir}/monodoc/web/*
+%{_prefix}/lib/monodoc/sources/Gendarme*
+%{_prefix}/lib/monodoc/sources/gendarme*
+%dir %{_prefix}/lib/monodoc/web
+%{_prefix}/lib/monodoc/web/*
 %{_mandir}/man5/gendarme*
 
 %changelog
+* Sun Oct 23 2011 Christian Krause <chkr at fedoraproject.org> - 2.10-4
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Sat Apr 30 2011 Christian Krause <chkr at fedoraproject.org> - 2.10-3
 - Rebuilt against mono 2.10.2
 


More information about the scm-commits mailing list