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

Christian Krause chkr at fedoraproject.org
Mon Oct 24 21:53:25 UTC 2011


commit 18ae90cd5499c8329740c2db3edb45eca6f479e4
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Oct 24 23:53:20 2011 +0200

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

 mono-addins.spec |   84 +++++++++++++++++++++++++++---------------------------
 1 files changed, 42 insertions(+), 42 deletions(-)
---
diff --git a/mono-addins.spec b/mono-addins.spec
index 15fc90f..281ac90 100644
--- a/mono-addins.spec
+++ b/mono-addins.spec
@@ -2,14 +2,14 @@
 
 Name:		mono-addins
 Version:	0.6.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Addins for mono
 Group:		Development/Languages
 License:	MIT
 URL:		http://www.mono-project.com/Main_Page
 Source0:	http://origin-download.mono-project.com/sources/mono-addins/mono-addins-%{version}.tar.bz2
 
-BuildRequires:	mono-devel >= 2.4, gtk-sharp2-devel, autoconf, automake
+BuildRequires:	mono-devel >= 2.4, gtk-sharp2-devel
 BuildRequires:	pkgconfig
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
@@ -51,64 +51,64 @@ using add-in references directly in a build file (still experimental).
 
 %prep
 %setup -q 
-sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' mautil/Makefile.am
-sed -i -e 's!$(prefix)/lib!%{_libdir}!' configure.ac
-for f in `find . -name '*.pc.in'`; do
-    sed -i 's|${prefix}/lib/mono|%{_libdir}/mono|' $f
-done
-autoreconf -f -i -s
 
 %build
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --enable-gui
+%configure --enable-gui --libdir=%{_prefix}/lib
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+mv %{buildroot}%{_prefix}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig
 
 %files 
 %defattr(-,root,root,-)
 %doc README NEWS AUTHORS ChangeLog
 %{_bindir}/mautil
-%dir %{_libdir}/mono/mono-addins
-%{_libdir}/mono/mono-addins/Mono.Addins.CecilReflector.dll
-%{_libdir}/mono/mono-addins/Mono.Addins.Gui.dll
-%{_libdir}/mono/mono-addins/Mono.Addins.Setup.dll
-%{_libdir}/mono/mono-addins/Mono.Addins.dll
-%{_libdir}/mono/mono-addins/mautil.exe
-%{_libdir}/mono/gac/Mono.Addins.Gui
-%{_libdir}/mono/gac/Mono.Addins.Setup
-%{_libdir}/mono/gac/Mono.Addins
-%{_libdir}/mono/gac/Mono.Addins.CecilReflector
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins.Gui
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins.Setup
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins.CecilReflector
-%{_libdir}/mono/gac/policy.0.3.Mono.Addins.Gui
-%{_libdir}/mono/gac/policy.0.3.Mono.Addins.Setup
-%{_libdir}/mono/gac/policy.0.3.Mono.Addins
-%{_libdir}/mono/gac/policy.0.3.Mono.Addins.CecilReflector
-%{_libdir}/mono/gac/policy.0.4.Mono.Addins.CecilReflector
-%{_libdir}/mono/gac/policy.0.4.Mono.Addins.Gui
-%{_libdir}/mono/gac/policy.0.4.Mono.Addins.Setup
-%{_libdir}/mono/gac/policy.0.4.Mono.Addins
-%{_libdir}/mono/gac/policy.0.5.Mono.Addins.CecilReflector
-%{_libdir}/mono/gac/policy.0.5.Mono.Addins.Gui
-%{_libdir}/mono/gac/policy.0.5.Mono.Addins.Setup
-%{_libdir}/mono/gac/policy.0.5.Mono.Addins
+%dir %{_prefix}/lib/mono/mono-addins
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.CecilReflector.dll
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.Gui.dll
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.Setup.dll
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.dll
+%{_prefix}/lib/mono/mono-addins/mautil.exe
+%{_prefix}/lib/mono/gac/Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/Mono.Addins.Setup
+%{_prefix}/lib/mono/gac/Mono.Addins
+%{_prefix}/lib/mono/gac/Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins.Setup
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins.Setup
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.4.Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.4.Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/policy.0.4.Mono.Addins.Setup
+%{_prefix}/lib/mono/gac/policy.0.4.Mono.Addins
+%{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.Setup
+%{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins
 %{_mandir}/man1/mautil.1.gz
 
 %files devel
 %defattr (-,root,root,-)
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins.MSBuild
-%{_libdir}/mono/gac/policy.0.3.Mono.Addins.MSBuild
-%{_libdir}/mono/gac/policy.0.4.Mono.Addins.MSBuild
-%{_libdir}/mono/gac/policy.0.5.Mono.Addins.MSBuild
-%{_libdir}/mono/mono-addins/Mono.Addins.MSBuild.dll
-%{_libdir}/mono/gac/Mono.Addins.MSBuild
-%{_libdir}/mono/xbuild
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins.MSBuild
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins.MSBuild
+%{_prefix}/lib/mono/gac/policy.0.4.Mono.Addins.MSBuild
+%{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.MSBuild
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.MSBuild.dll
+%{_prefix}/lib/mono/gac/Mono.Addins.MSBuild
+%{_prefix}/lib/mono/xbuild
 %{_libdir}/pkgconfig/mono-addins*
 
 %changelog
+* Sun Oct 23 2011 Christian Krause <chkr at fedoraproject.org> - 0.6.2-3
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Sun Sep 11 2011 Christian Krause <chkr at fedoraproject.org> - 0.6.2-2
 - Fix paths for x86_64
 


More information about the scm-commits mailing list