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

Sun Oct 23 21:46:27 UTC 2011

commit 3860260f9a4fd751edd764d8302ab95fde3b6f46
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sun Oct 23 23:46:17 2011 +0200

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

 mono-1.2.3-use-monodir.patch      |   14 --
 mono-2.0-monoservice.patch        |   12 --
 mono-2.10-libdir.patch            |  247 -------------------------------------
 mono-2.10-metadata-makefile.patch |   40 ------
 mono-2.2-uselibdir.patch          |   15 ---
 mono.spec                         |   53 +++------
 monodir.c                         |    6 -
 7 files changed, 16 insertions(+), 371 deletions(-)
---

diff --git a/mono.spec b/mono.spec
index 969e4f2..15279cf 100644
--- a/mono.spec
+++ b/mono.spec
@@ -1,13 +1,12 @@
 Name:           mono
 Version:        2.10.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.mono-project.com/Main_Page
 Source0:        http://origin-download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
-Source1:        monodir.c
 # This key was generated by Tom "spot" Callaway <tcallawa at redhat.com> on Dec 1, 2009
 # by running the following command:
 # sn -k mono.snk
@@ -25,8 +24,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  libunwind
 BuildRequires:  libunwind-devel
 %endif
-# Required for mono-libdir.patch
-BuildRequires: automake libtool gettext-devel
+BuildRequires: gettext-devel
 
 # Yes, mono actually depends on itself, because
 # we deleted the bootstrapping binaries. If you
@@ -39,11 +37,6 @@ BuildRequires: mono-core
 ExclusiveArch: %ix86 x86_64 ia64 %{arm} sparcv9 alpha s390x ppc ppc64
 
 Patch0: mono-2.8-ppc-thread.patch
-Patch1: mono-2.10-libdir.patch
-Patch2: mono-1.2.3-use-monodir.patch
-Patch3: mono-2.2-uselibdir.patch
-Patch4: mono-2.0-monoservice.patch
-Patch5: mono-2.10-metadata-makefile.patch
 Patch6: mono-281-libgdiplusconfig.patch
 Patch7: mono-2.10-monodis.patch
 
@@ -253,7 +246,7 @@ Development file for monodoc
 
 %endif
 
-%define monodir %{_libdir}/mono
+%define monodir /usr/lib/mono
 %define gac_dll(dll)  %{monodir}/gac/%{1} \
   %{monodir}/?.?/%{1}.dll \
   %{nil}
@@ -266,18 +259,8 @@ Development file for monodoc
 %setup -q
 
 %patch0 -p1 -b .ppc-threading
-sed -i -e 's!@LIBDIR@!%{_libdir}!' %{PATCH1}
-sed -i -e 's!@LIBDIR@!%{_libdir}!' %{PATCH5}
-%patch1 -p1 -b .libdir
-%patch5 -F 2 -p1 -b .metadata-makefile
-sed -i -e 's!%{_libdir}!@LIBDIR@!' %{PATCH1}
-sed -i -e 's!%{_libdir}!@LIBDIR@!' %{PATCH5}
-%patch2 -p1 -b .usemonodir
-%patch3 -p1 -b .uselibdir
-%patch4 -p1 -b .monoservice
 %patch6 -F 1 -p1 -b .libgdiplus
 %patch7 -p1 -b .monodis
-autoreconf -f -i -s
 
 # Add undeclared Arg
 sed -i "61a #define ARG_MAX     _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
@@ -292,8 +275,6 @@ export CFLAGS="-O2 -fno-strict-aliasing"
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %endif
 
-gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
-
 %configure --with-ikvm-native=yes --with-jit=yes --with-xen_opt=yes \
            --with-moonlight=no --with-profile2=yes --with-monotouch=no \
            --with-libgdiplus=installed --with-sgen=no \
@@ -305,9 +286,7 @@ gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 make 
 
 %install
-%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot}  install 
-install monodir %{buildroot}%{_bindir}
 
 # copy the mono.snk key into /etc/pki/mono
 mkdir -p %{buildroot}%{_sysconfdir}/pki/mono
@@ -328,12 +307,12 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/barrett_diagram
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/*.html
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/gc.man
-%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/mscorlib.dll.so
-%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/mcs.exe.so
-%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/gmcs.exe.so
+%{__rm} -f %{buildroot}%{monodir}/2.0/mscorlib.dll.so
+%{__rm} -f %{buildroot}%{monodir}/2.0/mcs.exe.so
+%{__rm} -f %{buildroot}%{monodir}/2.0/gmcs.exe.so
 %{__rm} -rf %{buildroot}%{monodir}/xbuild/Microsoft
-%{__rm} -f %{buildroot}%{_libdir}/mono/4.0/mscorlib.dll.so
-%{__rm} -f %{buildroot}%{_libdir}/mono/4.0/dmcs.exe.so
+%{__rm} -f %{buildroot}%{monodir}/4.0/mscorlib.dll.so
+%{__rm} -f %{buildroot}%{monodir}/4.0/dmcs.exe.so
 %{__rm} -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32
 %{__rm} -rf %{buildroot}%{_bindir}/mono-configuration-crypto
 %{__rm} -rf %{buildroot}%{_mandir}/man?/mono-configuration-crypto*
@@ -348,14 +327,10 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 
 %postun devel -p /sbin/ldconfig
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files core -f mcs.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
 %{_bindir}/mono
-%{_bindir}/monodir
 %{_bindir}/mono-test-install
 %{_bindir}/mono-gdb.py
 %mono_bin csharp
@@ -426,7 +401,6 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %config (noreplace) %{_sysconfdir}/mono/config
 %config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
-%{_libdir}/mono-source-libs/
 %{_libdir}/libmono*-2.0.so.*
 %{_libdir}/libmono-profiler-*.so.*
 %config (noreplace) %{_sysconfdir}/mono/4.0/*.config
@@ -500,6 +474,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %mono_bin sgen
 %mono_bin secutil
 %mono_bin signcode
+%{_prefix}/lib/mono-source-libs/
 %{_bindir}/pedump
 %{_mandir}/man1/resgen.1.gz
 %{_mandir}/man1/al.1.gz
@@ -568,7 +543,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %{_includedir}/mono-2.0/mono/utils/*.h
 %{_includedir}/mono-2.0/mono/cil/opcode.def
 %{_libdir}/libmono*-2.0.so
-%{_libdir}/mono/xbuild-frameworks
+%{monodir}/xbuild-frameworks
 
 %files nunit
 %defattr(-,root,root,-)
@@ -720,8 +695,8 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %files -n monodoc
 %defattr(-, root, root)
 %{monodir}/gac/monodoc
-%{_libdir}/monodoc/*
-%{monodir}/monodoc/monodoc.dll
+%{monodir}/monodoc/*
+%{_prefix}/lib/monodoc
 %mono_bin mdoc
 %{_bindir}/mod
 %{_bindir}/mdoc-*
@@ -739,6 +714,10 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 
 
 %changelog
+* Sun Oct 23 2011 Christian Krause <chkr at fedoraproject.org> - 2.10.6-2
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Sat Oct 15 2011 Christian Krause <chkr at fedoraproject.org> - 2.10.6-1
 - Update to 2.10.6
 
