rpms/libtunepimp/devel libtunepimp.spec,1.37,1.38

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libtunepimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19530

Modified Files:
	libtunepimp.spec 
Log Message:
* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.3-13
- fix build (libtool(2) and more rpath fun)



Index: libtunepimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libtunepimp.spec	29 Nov 2008 16:48:06 -0000	1.37
+++ libtunepimp.spec	5 Dec 2008 17:07:08 -0000	1.38
@@ -6,7 +6,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -19,7 +19,13 @@
 
 %define pkglibdir %{_libdir}/tunepimp
 
-BuildRequires: automake libtool
+%if 0%{?fedora} > 10
+# libtool2 (libltdl) building busted
+%else
+%define use_autofoo 1
+BuildRequires: automake libtool libtool-ltdl-devel
+%endif
+BuildRequires: chrpath
 BuildRequires: flac-devel
 %{?_with_mp4:BuildRequires: libmp4v2-devel}
 BuildRequires: libmpcdec-devel
@@ -59,11 +65,12 @@
 %description devel
 %{summary}.
 
-%{!?python_sitelib:%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+%global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 %package -n python-tunepimp
 Summary: Python bindings for developing programs that will use %{name} 
 Group:   Development/Libraries
-%define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %description -n python-tunepimp
 %{summary}.
 
@@ -73,8 +80,15 @@
 
 %patch1 -p1 -b .gcc43
 
-# nuke rpath
-autoreconf
+# nuke rpath -- Rex
+%if 0%{?use_autofoo}
+autoreconf -i -f
+%else
+# ugly non-autofoo-but-works-with-libtool2 solution
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
+%endif
 
 
 %build
@@ -91,21 +105,28 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
+make install DESTDIR=%{buildroot} PLUGIN_DIR=%{pkglibdir}/plugins
 
 pushd python
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 popd
 
+for foo in \
+ %{buildroot}%{_bindir}/puid \
+ %{buildroot}%{_libdir}/libtunepimp.so \
+ %{buildroot}%{pkglibdir}/plugins/*.tpp ; do
+  chrpath --list $foo && chrpath --delete $foo
+done
+
 # unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%{!?_with_mp4:rm -f  $RPM_BUILD_ROOT%{pkglibdir}/plugins/mp4.tpp}
+rm -f %{buildroot}%{_libdir}/lib*.la
+%{!?_with_mp4:rm -f  %{buildroot}%{pkglibdir}/plugins/mp4.tpp}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -119,7 +140,7 @@
 # README omitted, it's mostly useless
 %doc README.LGPL
 %{_bindir}/puid
-%{_libdir}/lib*.so.*
+%{_libdir}/libtunepimp.so.5*
 %dir %{pkglibdir}/
 %dir %{pkglibdir}/plugins/
 %{pkglibdir}/plugins/flac.tpp
@@ -135,7 +156,7 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/lib*.so
+%{_libdir}/libtunepimp.so
 
 %files -n python-tunepimp
 %defattr(-,root,root,-)
@@ -144,6 +165,9 @@
 
 
 %changelog
+* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.3-13
+- fix build (libtool(2) and more rpath fun)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5.3-12
 - Rebuild for Python 2.6