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

Christian Krause chkr at fedoraproject.org
Sat Jun 9 20:34:25 UTC 2012


commit 14712957db78802fa8386a171629c8c71ce0366d
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sat Jun 9 22:34:19 2012 +0200

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

 ndesk-dbus-glib.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/ndesk-dbus-glib.spec b/ndesk-dbus-glib.spec
index d91ae99..ad1129e 100644
--- a/ndesk-dbus-glib.spec
+++ b/ndesk-dbus-glib.spec
@@ -5,7 +5,7 @@ URL:			http://www.ndesk.org/DBusSharp
 License:		MIT
 Group:			Development/Libraries
 Version:		0.4.1
-Release:		11%{?dist}
+Release:		12%{?dist}
 Summary:		Provides glib mainloop integration for ndesk-dbus
 Source0:		http://www.ndesk.org/archive/dbus-sharp/ndesk-dbus-glib-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,17 +35,16 @@ Development files for ndesk-dbus-glib
 %prep
 %setup -q
 
-# Fix libdir
-sed -i 's|${exec_prefix}/lib|%{_libdir}|g' %{name}-1.0.pc.in
-
 %build
-%configure
+%configure --libdir=%{_prefix}/lib
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
+test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/*.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,8 +52,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_libdir}/mono/gac/NDesk.DBus.GLib/
-%{_libdir}/mono/ndesk-dbus-glib-1.0/
+%{_prefix}/lib/mono/gac/NDesk.DBus.GLib/
+%{_prefix}/lib/mono/ndesk-dbus-glib-1.0/
 
 %files devel
 %defattr(-,root,root,-)
@@ -62,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ndesk-dbus-glib-1.0.pc
 
 %changelog
+* Sat Jun 09 2012 Christian Krause <chkr at fedoraproject.org> - 0.4.1-12
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list