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

[Christian Krause]

commit efdfb2fd7cd5ef2c21f291b961c9ec31a5ee743b
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Tue Oct 25 22:23:02 2011 +0200

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

 md-2.3-pcfile.patch    |    8 --------
 md-231-monocecil.patch |   30 ------------------------------
 monodevelop.spec       |   45 ++++++++++-----------------------------------
 3 files changed, 10 insertions(+), 73 deletions(-)
---
diff --git a/monodevelop.spec b/monodevelop.spec
index 3bd4e9c..ef929d9 100644
--- a/monodevelop.spec
+++ b/monodevelop.spec
@@ -6,7 +6,7 @@
 
 Name:           monodevelop
 Version:        2.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A full-featured IDE for Mono and Gtk#
 
 Group:          Development/Tools
@@ -53,42 +53,10 @@ Development files for %{name}.
 %setup -q
 %patch0 -p1 -b .unbundle-nunit
 
-sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \
-    -e 's!${exec_prefix}/lib!%{_libdir}!' configure
-sed -i -e 's!mdtool}/lib/!mdtool}/%{_lib}/!' mdtool.in
-sed -i -e 's!monodevelop}/lib/!monodevelop}/%{_lib}/!' monodevelop.in
-
-# fix for 64 bit systems as MD really is dumb sometimes!
-
-find . -name '*.cs' -and \
-     ! \( -name 'GNUCompiler.cs' -or -name 'CProjectConfiguration.cs' \) \
-      | while read f ;
-        do
-        sed -i -e 's!"lib"!"%{_lib}"!' "$f" 1>/dev/null
-        done
-
-find . -name Makefile.in -or -name \*.pc.in \
-       -or -name \*.in -or -name \*.xml \
-       | while read f ;
-         do
-           sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' \
-               -e 's!@prefix@/lib/!%{_libdir}/!' \
-               -e 's!/usr/lib/!%{_libdir}/!' \
-               -e 's!^MSB_REF_PREFIX :=.*!MSB_REF_PREFIX := %{_libdir}/mono/3.5/!' \
-               -e 's!${exec_prefix}/lib/!%{_libdir}/!' "$f" 1>/dev/null
-         done
-
 for f in `grep -rl 'NUnit/lib/nunit' \`find . -name 'Makefile.in'\``; do
-    sed -i 's|-r:.*NUnit/lib/nunit.|-r:%{_libdir}/mono/2.0/nunit.|' $f
+    sed -i 's|-r:.*NUnit/lib/nunit.|-r:%{_prefix}/lib/mono/2.0/nunit.|' $f
 done
 
-#for f in `grep -rl 'Cecil.dll' \`find . -name 'Makefile.in'\``; do
-#    sed -i 's|-r:.*Mono.Cecil.dll|-r:%{cecildll}|' $f
-#done
-#
-#for f in `grep -rl 'Cecil.Mdb.dll' \`find . -name 'Makefile.in'\``; do
-#    sed -i 's|-r:.*Mono.Cecil.Mdb.dll|-r:%{cecilmdbdll}|' $f
-#done
 
 # Delete shipped *.dll files
 find -name '*.dll' -exec rm -f {} \;
@@ -116,6 +84,9 @@ desktop-file-install \
                      --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/monodevelop.desktop
 
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+test "${_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgconfig/* $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+
 %find_lang %{name}
 
 %post
@@ -138,7 +109,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/m*
-%{_libdir}/monodevelop
+%{_prefix}/lib/monodevelop
 %{_mandir}/man1/m*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
@@ -149,6 +120,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/pkgconfig/monodevelop*.pc
 
 %changelog
+* Tue Oct 25 2011 Christian Krause <chkr at fedoraproject.org> - 2.8.1-2
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Sun Oct 16 2011 Christian Krause <chkr at fedoraproject.org> - 2.8.1-1
 - Update to 2.8.1