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

Christian Krause chkr at fedoraproject.org
Mon Oct 24 21:08:00 UTC 2011


commit fbe6349a0a9389c38115b7ce8c3900321751cab1
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Oct 24 23:07:55 2011 +0200

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

 gnome-desktop-sharp-2.24.0-libdir.patch |  127 -------------------------------
 gnome-desktop-sharp.spec                |   40 +++++-----
 2 files changed, 20 insertions(+), 147 deletions(-)
---
diff --git a/gnome-desktop-sharp.spec b/gnome-desktop-sharp.spec
index 4c3bbb5..c9696fe 100644
--- a/gnome-desktop-sharp.spec
+++ b/gnome-desktop-sharp.spec
@@ -1,13 +1,12 @@
 Name:           gnome-desktop-sharp
 Version:        2.26.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        .NET language binding for mono
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://www.mono-project.com/GtkSharp
 Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-2.24.0-libdir.patch
 Patch1:         %{name}-lib-target.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,11 +47,8 @@ Package %{name}-devel provides development files for writing
 
 %prep
 %setup -q
-%patch0 -p1 -b .libdir
 %patch1 -p1 -b .target
-
-# Fix GACUTIL FLAGS lib
-sed -i 's|$(prefix)/lib|%{_libdir}|g' configure
+sed -i -e 's!@libdir@!${exec_prefix}/lib/!g' gtksourceview/gtksourceview2-sharp.pc.in
 
 # Fix permission
 chmod 0644 HACKING
@@ -83,20 +79,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog AUTHORS README
 %{_libdir}/*.so
-%{_libdir}/mono/gac/gnomedesktop-sharp
-#%{_libdir}/mono/gac/gnome-panel-sharp
-%{_libdir}/mono/gac/gnome-print-sharp
-%{_libdir}/mono/gac/gtksourceview2-sharp
-%{_libdir}/mono/gac/rsvg2-sharp
-%{_libdir}/mono/gac/vte-sharp
-%{_libdir}/mono/gac/wnck-sharp
-%{_libdir}/mono/gnomedesktop-sharp-2.20
-#%{_libdir}/mono/gnome-panel-sharp-2.24
-%{_libdir}/mono/gnome-print-sharp-2.18
-%{_libdir}/mono/gtksourceview2-sharp-2.0
-%{_libdir}/mono/rsvg2-sharp-2.0
-%{_libdir}/mono/vte-sharp-0.16
-%{_libdir}/mono/wnck-sharp-2.20
+%{_prefix}/lib/mono/gac/gnomedesktop-sharp
+#%{_prefix}/lib/mono/gac/gnome-panel-sharp
+%{_prefix}/lib/mono/gac/gnome-print-sharp
+%{_prefix}/lib/mono/gac/gtksourceview2-sharp
+%{_prefix}/lib/mono/gac/rsvg2-sharp
+%{_prefix}/lib/mono/gac/vte-sharp
+%{_prefix}/lib/mono/gac/wnck-sharp
+%{_prefix}/lib/mono/gnomedesktop-sharp-2.20
+#%{_prefix}/lib/mono/gnome-panel-sharp-2.24
+%{_prefix}/lib/mono/gnome-print-sharp-2.18
+%{_prefix}/lib/mono/gtksourceview2-sharp-2.0
+%{_prefix}/lib/mono/rsvg2-sharp-2.0
+%{_prefix}/lib/mono/vte-sharp-0.16
+%{_prefix}/lib/mono/wnck-sharp-2.20
 %{_datadir}/gnomedesktop-sharp
 #%{_datadir}/gnome-panel-sharp
 %{_datadir}/gnome-print-sharp
@@ -111,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Oct 23 2011 Christian Krause <chkr at fedoraproject.org> - 2.26.0-14
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Thu Feb 10 2011 Christian Krause <chkr at fedoraproject.org> - 2.26.0-13
 - Disable gnome-panel bindings
 


More information about the scm-commits mailing list