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

[Christian Krause]

commit 0fc907e19c5bc7f5caeb9e8754d6833cc6dd1d46
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Thu Dec 1 23:35:18 2011 +0100

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

 ice.spec |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/ice.spec b/ice.spec
index 3624c86..d0857cc 100644
--- a/ice.spec
+++ b/ice.spec
@@ -7,7 +7,7 @@
 
 Name:           ice
 Version:        3.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        ZeroC Object-Oriented middleware
 
 Group:          System Environment/Libraries
@@ -235,7 +235,7 @@ mkdir -p $RPM_BUILD_ROOT
 
 # Do the basic "make install"
 cd $RPM_BUILD_DIR/Ice-%{version}
-make prefix=$RPM_BUILD_ROOT GACINSTALL=yes GAC_ROOT=$RPM_BUILD_ROOT%{_libdir} embedded_runpath_prefix="" libsubdir=%{_lib} install
+make prefix=$RPM_BUILD_ROOT GACINSTALL=yes GAC_ROOT=$RPM_BUILD_ROOT%{_prefix}/lib embedded_runpath_prefix="" libsubdir=%{_lib} install
 
 ## install java bindings in the right place
 mkdir -p ${RPM_BUILD_ROOT}%{_javadir}
@@ -332,13 +332,10 @@ popd
 # .NET spec files (for csharp-devel) -- convert the paths
 for f in IceGrid Glacier2 IceBox Ice IceStorm IcePatch2;
 do
-    sed -i -e "s#/lib/#%{_libdir}/#" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/$f.pc
-    sed -i -e "s#mono_root}/usr#mono_root}#" \
-        $RPM_BUILD_ROOT%{_libdir}/pkgconfig/$f.pc
     mv $RPM_BUILD_ROOT%{_bindir}/$f.xml \
-       $RPM_BUILD_ROOT%{_libdir}/mono/gac/$f/%{version}.*/
+       $RPM_BUILD_ROOT%{_prefix}/lib/mono/gac/$f/%{version}.*/
     # fix xml files permissions
-    chmod 0644 $RPM_BUILD_ROOT%{_libdir}/mono/gac/$f/%{version}.*/*.xml
+    chmod 0644 $RPM_BUILD_ROOT%{_prefix}/lib/mono/gac/$f/%{version}.*/*.xml
 done
 %else
 # clean some files when building without mono
@@ -518,19 +515,19 @@ fi
 %if 0%{?with_mono}
 %files csharp
 %defattr(-,root,root,-)
-%{_libdir}/mono/Glacier2/
-%{_libdir}/mono/Ice/
-%{_libdir}/mono/IceBox/
-%{_libdir}/mono/IceGrid/
-%{_libdir}/mono/IcePatch2/
-%{_libdir}/mono/IceStorm/
-%{_libdir}/mono/gac/Glacier2
-%{_libdir}/mono/gac/Ice
-%{_libdir}/mono/gac/IceBox
-%{_libdir}/mono/gac/IceGrid
-%{_libdir}/mono/gac/IcePatch2
-%{_libdir}/mono/gac/IceStorm
-%{_libdir}/mono/gac/policy*
+%{_prefix}/lib/mono/Glacier2/
+%{_prefix}/lib/mono/Ice/
+%{_prefix}/lib/mono/IceBox/
+%{_prefix}/lib/mono/IceGrid/
+%{_prefix}/lib/mono/IcePatch2/
+%{_prefix}/lib/mono/IceStorm/
+%{_prefix}/lib/mono/gac/Glacier2
+%{_prefix}/lib/mono/gac/Ice
+%{_prefix}/lib/mono/gac/IceBox
+%{_prefix}/lib/mono/gac/IceGrid
+%{_prefix}/lib/mono/gac/IcePatch2
+%{_prefix}/lib/mono/gac/IceStorm
+%{_prefix}/lib/mono/gac/policy*
 %{_bindir}/iceboxnet.exe
 %doc %{_mandir}/man1/iceboxnet.exe.1.gz
 
@@ -578,6 +575,10 @@ fi
 
 
 %changelog
+* Tue Nov 29 2011 Christian Krause <chkr at fedoraproject.org> - 3.4.2-5
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Mon Oct 31 2011 Dan Horák <dan[at]danny.cz> - 3.4.2-4
 - fix libsubdir path on non-x86 64-bit arches
 - fix build without Mono