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

Christian Krause chkr at fedoraproject.org
Sat Oct 29 12:17:15 UTC 2011


commit 167c72d05338fe89486a6bb567d18e56e8474249
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sat Oct 29 14:17:10 2011 +0200

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

 gdata-sharp.spec |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/gdata-sharp.spec b/gdata-sharp.spec
index e450308..d077141 100644
--- a/gdata-sharp.spec
+++ b/gdata-sharp.spec
@@ -3,7 +3,7 @@
 
 Name:           gdata-sharp
 Version:        1.4.0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        .NET library for the Google Data API
 
 Group:          System Environment/Libraries
@@ -13,7 +13,6 @@ Source0:        http://google-gdata.googlecode.com/files/%{upstream_name}-%{vers
 # fixed in SVN:
 # http://code.google.com/p/google-gdata/source/detail?spec=svn933&r=890
 Patch0:         %{upstream_name}-1.4.0.2-pkgconfig.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-nunit
 #Requires:       
@@ -59,13 +58,6 @@ developing applications that use %{name}.
 %setup -q -n %{upstream_name}-%{version}
 %patch0 -p1 -b .pkgconfig
 
-sed -i "s|\$(PREFIX)/lib|\$(PREFIX)/%{_lib}|g" Makefile
-
-for i in misc/*.pc.in; do
-  sed -i "s|libdir=\${prefix}/lib|libdir=\${prefix}/%{_lib}|" "$i"
-done
-
-
 %build
 make %{?_smp_mflags} PREFIX=%{_prefix}
 
@@ -75,19 +67,16 @@ make %{?_smp_mflags} PREFIX=%{_prefix}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+test "${_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgconfig/* $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE-2.0.txt RELEASE_NOTES.HTML
-%{_libdir}/mono/GData-Sharp
-%{_libdir}/mono/gac/Google.GData.*
+%{_prefix}/lib/mono/GData-Sharp
+%{_prefix}/lib/mono/gac/Google.GData.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -95,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 29 2011 Christian Krause <chkr at fedoraproject.org> - 1.4.0.2-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> - 1.4.0.2-5
 - updated the supported arch list
 


More information about the scm-commits mailing list