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

Christian Krause chkr at fedoraproject.org
Sat Oct 29 10:06:08 UTC 2011


commit d6997eaed8144de608110008f76902c96fdc7995
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sat Oct 29 12:06:03 2011 +0200

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

 taglib-sharp-2.0.3.2-libdir.patch |   12 ------------
 taglib-sharp.spec                 |   23 +++++++++--------------
 2 files changed, 9 insertions(+), 26 deletions(-)
---
diff --git a/taglib-sharp.spec b/taglib-sharp.spec
index a2b7ec5..aa2421c 100644
--- a/taglib-sharp.spec
+++ b/taglib-sharp.spec
@@ -2,14 +2,13 @@
 
 Name:    taglib-sharp
 Version: 2.0.3.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Provides tag reading and writing for Banshee and other Mono apps
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.banshee-project.org/taglib-sharp/
 Source0: http://download.banshee-project.org/taglib-sharp/%{version}/%{name}-%{version}.tar.bz2
-Patch0:  taglib-sharp-2.0.3.2-libdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Mono only available on these:
@@ -38,10 +37,6 @@ Development files for taglib-sharp.
 
 %prep
 %setup -q
-%patch0 -p1 -b .libdir
-
-sed -i -e 's!$(prefix)/lib!%{_libdir}!g' \
-    -e 's!${exec_prefix}/lib!%{_libdir}!g' configure
 
 %build
 # Docs are broken.
@@ -49,20 +44,16 @@ sed -i -e 's!$(prefix)/lib!%{_libdir}!g' \
 make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Fix the .pc file to handle 64bit
-sed -i 's|${exec_prefix}/lib|%{_libdir}|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/taglib-sharp.pc
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+mv %{buildroot}%{_datadir}/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_libdir}/mono/gac/*/
-%{_libdir}/mono/taglib-sharp/
+%{_prefix}/lib/mono/gac/*/
+%{_prefix}/lib/mono/taglib-sharp/
 
 %files devel
 %defattr(-,root,root,-)
@@ -70,6 +61,10 @@ sed -i 's|${exec_prefix}/lib|%{_libdir}|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/t
 %{_libdir}/pkgconfig/taglib-sharp.pc
 
 %changelog
+* Sat Oct 29 2011 Christian Krause <chkr at fedoraproject.org> - 2.0.3.7-4
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Mon Mar 21 2011 Dan HorĂ¡k <dan[at]danny.cz> - 2.0.3.7-3
 - updated the supported arch list
 


More information about the scm-commits mailing list