rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec, 1.8, 1.9 needs.rebuild, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5176

Modified Files:
	kdemultimedia-extras.spec 
Removed Files:
	needs.rebuild 
Log Message:
* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-5
- fc6 respin



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdemultimedia-extras.spec	9 Aug 2006 18:41:46 -0000	1.8
+++ kdemultimedia-extras.spec	29 Aug 2006 18:26:07 -0000	1.9
@@ -22,6 +22,7 @@
 BuildConflicts: akode-extras
 # debugging: to make sure no extras bits (accidentally) get excluded
 %{?debug:BuildConflicts: kdemultimedia-extras = %{epoch}:%{version}}
+# disabled until fixed to work w/libtunepimp-0.5.x
 %define _with_musicbrainz --with-musicbrainz
 %define _with_libsamplerate --with-libsamplerate
 %define _with_taglib --with-taglib
@@ -69,7 +70,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.4
-Release: 3%{?dist}%{?kde}
+Release: 5%{?dist}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -97,7 +98,7 @@
 BuildRequires: libvorbis-devel >= 1:1.1.0
 %{?core:Requires: libvorbis >= 1:1.1.0}
 %{?_with_taglib:BuildRequires: taglib-devel}
-%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel >= 0:2.1, libtunepimp-devel}
+%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel >= 0:2.1, libtunepimp-devel >= 0.5.0}
 %{?_with_akode:BuildRequires: akode-devel}
 # gstreamer(08) pkg_name
 %{?_with_gstreamer:BuildRequires: %{?gst}%{!?gst:gstreamer}-plugins-devel}
@@ -340,14 +341,19 @@
 
 mv %{name}.lang %{name}.list
 
-[ ! -f %{name}.list ] && echo "%defattr(-,root,root)" > %{name}.list
-[ ! -f devel.list ]  && echo "%defattr(-,root,root)" > devel.list
-
-## cleanup .la files (178734)
-# if built without --without-libltdl: /usr/lib/libltdl.la 
-sed -i -e "s@%{_libdir}/libltdl.la@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||:
+## remove references to optional external libraries in .la files (#178734)
 # alsa-lib/asound
-sed -i -e "s at -lasound@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||:
+sed -i -e "s at -lasound@@g"       $RPM_BUILD_ROOT%{_libdir}/*.la
+# audiofile
+sed -i -e "s at -laudiofile@@g"    $RPM_BUILD_ROOT%{_libdir}/*.la
+# ogg/vorbis
+sed -i -e "s at -lvorbisfile@@g"   $RPM_BUILD_ROOT%{_libdir}/*.la
+sed -i -e "s at -lvorbisenc@@g"    $RPM_BUILD_ROOT%{_libdir}/*.la
+sed -i -e "s at -lvorbis@@g"       $RPM_BUILD_ROOT%{_libdir}/*.la
+sed -i -e "s at -logg@@g"          $RPM_BUILD_ROOT%{_libdir}/*.la
+# if built without --without-libltdl: /usr/lib/libltdl.la
+sed -i -e "s@%{_libdir}/libltdl.la@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||:
+
 
 
 %if "%{?core}" == "1"
@@ -395,7 +401,8 @@
 %files -f %{name}.list
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
-%{_libdir}/lib*.so*
+%{_libdir}/libkdeinit_*.so
+%{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 %{_bindir}/*
 # Own dir(s) until owned by kdelibs? -- Rex
@@ -413,9 +420,11 @@
 %{_libdir}/mcop/*
 %{_libdir}/kde3/*
 
-%files devel -f devel.list
+%files devel 
 %defattr(-,root,root,-)
 %{_includedir}/*
+%{_libdir}/lib*.so
+%exclude %{_libdir}/libkdeinit_*
 %endif
 
 %if "%{?extras}" == "1"
@@ -442,6 +451,13 @@
 
 
 %changelog
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-5
+- fc6 respin
+
+* Thu Aug 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-4
+- strip ogg/vorbis, audiofile from .la files (#178734)
+- move %%_libdir/lib*.so to -devel
+
 * Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-3
 - (core)/-extras: use kdemultimedia-3.5.4-patched
 - BR: gettext


--- needs.rebuild DELETED ---