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

Christian Krause chkr at fedoraproject.org
Sun Oct 23 22:45:36 UTC 2011


commit bd225c5d33d6380c8f8c0149a14fba37d9b91086
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Oct 24 00:45:25 2011 +0200

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

 gtk-sharp2-2.10.3-libdir.patch |   85 ----------------------------------------
 gtk-sharp2.spec                |   37 +++++++----------
 2 files changed, 16 insertions(+), 106 deletions(-)
---
diff --git a/gtk-sharp2.spec b/gtk-sharp2.spec
index 3285e6b..529c58b 100644
--- a/gtk-sharp2.spec
+++ b/gtk-sharp2.spec
@@ -1,13 +1,12 @@
 Name:           gtk-sharp2
 Version:        2.12.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.mono-project.com/GtkSharp
 Source0:        http://origin-download.mono-project.com/sources/gtk-sharp212/gtk-sharp-%{version}.tar.bz2
-Patch0:         gtk-sharp2-2.10.3-libdir.patch
 
 BuildRequires:  mono-devel gtk2-devel libglade2-devel monodoc
 BuildRequires:  automake, libtool
@@ -54,29 +53,21 @@ This package provides the Gtk# documentation for monodoc.
 
 %prep
 %setup -q -n gtk-sharp-%{version}
-%patch0 -p1 -b .libdir
 
-# Fix assembly libdir
-sed -i 's|$(prefix)/lib|%{_libdir}|g' parser/Makefile.in \
-                                      generator/Makefile.in \
-                                      doc/Makefile.* \
-                                      configure.in
 # Fix permissions of source files
 find -name '*.c' -exec chmod a-x {} \;
 
 %build
-#autoreconf --force --install
 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
 
 #Remove libtool archive
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.*a
+%{__rm} $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.*a
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -85,20 +76,20 @@ make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacd
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_libdir}/*.so
-%dir %{_libdir}/gtk-sharp-2.0
-%{_libdir}/mono/gac
-%{_libdir}/mono/gtk-sharp-2.0
+%dir %{_prefix}/lib/gtk-sharp-2.0
+%{_prefix}/lib/mono/gac
+%{_prefix}/lib/mono/gtk-sharp-2.0
 
 %files gapi
 %defattr(-,root,root,-)
 %{_bindir}/gapi2-codegen
 %{_bindir}/gapi2-fixup
 %{_bindir}/gapi2-parser
-%{_libdir}/gtk-sharp-2.0/gapi_codegen.exe
-%{_libdir}/gtk-sharp-2.0/gapi-fixup.exe
-%{_libdir}/gtk-sharp-2.0/gapi-parser.exe
-%{_libdir}/gtk-sharp-2.0/gapi_pp.pl
-%{_libdir}/gtk-sharp-2.0/gapi2xml.pl
+%{_prefix}/lib/gtk-sharp-2.0/gapi_codegen.exe
+%{_prefix}/lib/gtk-sharp-2.0/gapi-fixup.exe
+%{_prefix}/lib/gtk-sharp-2.0/gapi-parser.exe
+%{_prefix}/lib/gtk-sharp-2.0/gapi_pp.pl
+%{_prefix}/lib/gtk-sharp-2.0/gapi2xml.pl
 %{_datadir}/gapi-2.0
 %{_libdir}/pkgconfig/gapi-2.0.pc
 
@@ -109,9 +100,13 @@ make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp-2.0 /gacd
 
 %files doc
 %defattr(-,root,root,-)
-%{_libdir}/monodoc/sources/*
+%{_prefix}/lib/monodoc/sources/*
 
 %changelog
+* Sun Oct 23 2011 Christian Krause <chkr at fedoraproject.org> - 2.12.11-2
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Sun Sep 04 2011 Christian Krause <chkr at fedoraproject.org> - 2.12.11-1
 - Update to new upstream version
 


More information about the scm-commits mailing list