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

Christian Krause chkr at fedoraproject.org
Mon Oct 24 20:33:25 UTC 2011


commit 55e90703711f4268d5dfa6d380d9dcd6cba9b4dc
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Oct 24 22:33:20 2011 +0200

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

 gnome-sharp-2.20.0-libdir.patch |   71 ---------------------------------------
 gnome-sharp.spec                |   17 +++++----
 2 files changed, 9 insertions(+), 79 deletions(-)
---
diff --git a/gnome-sharp.spec b/gnome-sharp.spec
index d677094..abe64b7 100644
--- a/gnome-sharp.spec
+++ b/gnome-sharp.spec
@@ -1,6 +1,6 @@
 Name:           gnome-sharp
 Version:        2.24.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -8,7 +8,6 @@ License:        LGPLv2+
 URL:            ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-%{version}.tar.bz2
 
-Patch1: %{name}-2.20.0-libdir.patch
 Patch0: %{name}-2241-getopts.patch
 # init gtype before using gconf
 Patch2: gnome-sharp-gconf-init.patch
@@ -42,7 +41,6 @@ for writing gnome-sharp2 applications.
 %prep
 %setup -q
 %patch0 -p1 -b .getopts
-%patch1 -p1 -b .libdir
 %patch2 -p1 -b .gconf-init
 
 %build
@@ -50,13 +48,12 @@ autoreconf --force --install
 aclocal
 #sed -i -e 's!-r:Mono.GetOptions.dll! !' sample/gnomevfs/Makefile.in
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-export MONO_CAIRO_LIBS="-r:%{_libdir}/mono/2.0/Mono.Cairo.dll"
 %configure
 make
 
 %install
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacdir %{_libdir} /root ${RPM_BUILD_ROOT}%{_libdir}"
+make install DESTDIR=$RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.*a
 
 %post -p /sbin/ldconfig
@@ -66,10 +63,10 @@ make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacd
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_bindir}/gconfsharp2-schemagen
-%{_libdir}/gtk-sharp-2.0/gconfsharp-schemagen.exe
+%{_prefix}/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe
 %{_libdir}/*.so
-%{_libdir}/mono/gac
-%{_libdir}/mono/gtk-sharp-2.0/*.dll
+%{_prefix}/lib/mono/gac
+%{_prefix}/lib/mono/gtk-sharp-2.0/*.dll
 %{_datadir}/gapi-2.0/*
 
 %files devel
@@ -78,6 +75,10 @@ make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacd
 %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc
 
 %changelog
+* Sun Oct 23 2011 Christian Krause <chkr at fedoraproject.org> - 2.24.1-7
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Mon Mar 28 2011 Christian Krause <chkr at fedoraproject.org> - 2.24.1-6
 - Rebuilt against mono-2.10
 - Remove gtkhtml binding


More information about the scm-commits mailing list