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

Christian Krause chkr at fedoraproject.org
Mon Oct 31 23:08:57 UTC 2011


commit 88225d1a20d2e307d47842a2f0ff256cdc52404b
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Tue Nov 1 00:08:45 2011 +0100

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

 mono-zeroconf.spec |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/mono-zeroconf.spec b/mono-zeroconf.spec
index f8bc7e1..92036ee 100644
--- a/mono-zeroconf.spec
+++ b/mono-zeroconf.spec
@@ -2,13 +2,12 @@
 
 Name:           mono-zeroconf
 Version:        0.9.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Mono.Zeroconf networking library
 Group:          Development/Languages
 License:        MIT
 URL:            http://banshee-project.org/files/mono-zeroconf
 Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel monodoc-devel
 Requires:       mono-core
 
@@ -29,36 +28,35 @@ Development files and documentation for Mono.Zeroconf
 
 %prep
 %setup -q
-# https://bugzilla.novell.com/show_bug.cgi?id=549163
-sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure.ac
-sed -i -e 's!$(DESTDIR)$(prefix)/lib!$(DESTDIR)%{_libdir}!' configure
 
 %build
-%configure --disable-mdnsresponder
+%configure --disable-mdnsresponder --libdir=%{_prefix}/lib
 #parallel build doesn't work
 make
 
 %install
-%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-
-%clean
-%{__rm} -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+test "%{_libdir}" = "%{_prefix}/lib" || mv %{buildroot}%{_prefix}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
 
 %files 
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog NEWS README
 %{_bindir}/mzclient
-%{_libdir}/mono-zeroconf/
-%{_libdir}/mono/gac/Mono.Zeroconf
-%{_libdir}/mono/mono-zeroconf
-%{_libdir}/mono/gac/policy.*
+%{_prefix}/lib/mono-zeroconf/
+%{_prefix}/lib/mono/gac/Mono.Zeroconf
+%{_prefix}/lib/mono/mono-zeroconf
+%{_prefix}/lib/mono/gac/policy.*
 
 %files devel
 %{_libdir}/pkgconfig/mono-zeroconf.pc
-%{_libdir}/monodoc/sources/mono-zeroconf*
+%{_prefix}/lib/monodoc/sources/mono-zeroconf*
 
 %changelog
+* Tue Nov 01 2011 Christian Krause <chkr at fedoraproject.org> - 0.9.0-6
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Fri Feb 25 2011 Dan HorĂ¡k <dan[at]danny.cz> - 0.9.0-5
 - updated the supported arch list
 


More information about the scm-commits mailing list