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

Christian Krause chkr at fedoraproject.org
Mon Oct 31 15:41:28 UTC 2011


commit e137a3c1741f8239d24ac102f2c511767c92ac1a
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Oct 31 16:41:18 2011 +0100

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

 flickrnet.pc   |    2 +-
 flickrnet.spec |   19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/flickrnet.pc b/flickrnet.pc
index da6d384..a73ad57 100644
--- a/flickrnet.pc
+++ b/flickrnet.pc
@@ -1,4 +1,4 @@
-libdir=@LIBDIR@
+libdir=/usr/lib
 assemblies_dir=${libdir}/mono/flickrnet
 Libraries=${assemblies_dir}/FlickrNet.dll
  
diff --git a/flickrnet.spec b/flickrnet.spec
index 36cbe2c..a0da286 100644
--- a/flickrnet.spec
+++ b/flickrnet.spec
@@ -2,7 +2,7 @@
 
 Name:           flickrnet
 Version:        2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        .NET library to interact with the Flickr API
 Group:          Development/Libraries
 License:        LGPLv2
@@ -11,7 +11,6 @@ URL:            http://www.codeplex.com/FlickrNet
 Source0:        FlickrNet2.2-Src-48055.zip
 Source1:        flickrnet.pc
 Patch0:         assemblyinfo.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-devel
 
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
@@ -37,32 +36,30 @@ The %{name}-devel package contains development files for %{name}.
 cd FlickrNet
 %patch0 -p1
 
-sed -i 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1}
-
 %build
 cd FlickrNet
 gmcs -debug -target:library -out:FlickrNet.dll  -r:System.Web.dll -r:System.Drawing.dll *.cs
 
 %install
-rm -rf %{buildroot}
 cd FlickrNet
-gacutil -i FlickrNet.dll -package %{name} -root %{buildroot}%{_libdir}
+gacutil -i FlickrNet.dll -package %{name} -root %{buildroot}%{_prefix}/lib
 install -m 0755 -d %{buildroot}%{_libdir}/pkgconfig
 install -m 0644 -p %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
-%{_libdir}/mono/%{name}
-%{_libdir}/mono/gac/FlickrNet
+%{_prefix}/lib/mono/%{name}
+%{_prefix}/lib/mono/gac/FlickrNet
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Oct 31 2011 Christian Krause <chkr at fedoraproject.org> - 2.2-9
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list