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

Christian Krause chkr at fedoraproject.org
Sat Jun 9 20:16:03 UTC 2012


commit 45afd1c233853216282950546e6226792f04c380
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sat Jun 9 22:15:57 2012 +0200

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

 ndesk-dbus.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/ndesk-dbus.spec b/ndesk-dbus.spec
index 69f7293..a86f100 100644
--- a/ndesk-dbus.spec
+++ b/ndesk-dbus.spec
@@ -2,7 +2,7 @@
 
 Name:			ndesk-dbus
 Version:		0.6.1a
-Release:		10%{?dist}
+Release:		11%{?dist}
 Summary:		Managed C# implementation of DBus
 
 License:		MIT
@@ -37,9 +37,7 @@ Development files for ndesk-dbus
 
 
 %build
-# hack pkgconfig file for multilib handling - this is ugly
-sed -ie "s,^libdir=.*$,libdir=%{_libdir},g" %{name}-1.0.pc.in
-%configure
+%configure --libdir=%{_prefix}/lib
 make %{?_smp_mflags}
 
 
@@ -47,6 +45,9 @@ make %{?_smp_mflags}
 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
@@ -54,14 +55,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/mono/ndesk-dbus-1.0/
-%{_libdir}/mono/gac/NDesk.DBus/
+%{_prefix}/lib/mono/ndesk-dbus-1.0/
+%{_prefix}/lib/mono/gac/NDesk.DBus/
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/ndesk-dbus-1.0.pc
 
 %changelog
+* Sat Jun 09 2012 Christian Krause <chkr at fedoraproject.org> - 0.6.1a-11
+- 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.6.1a-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list