Author: rdieter
Update of /cvs/extras/rpms/kdemultimedia-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21879
Modified Files:
.cvsignore kdemultimedia-extras.spec sources
Log Message:
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
- -extras: drop --with-musicbrainz (for now)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 21 Jul 2006 13:18:37 -0000 1.4
+++ .cvsignore 28 Sep 2006 20:25:28 -0000 1.5
@@ -1,2 +1,3 @@
kdemultimedia-3.5.2-patched.tar.bz2
kdemultimedia-3.5.3-patched.tar.bz2
+kdemultimedia-3.5.4-patched.tar.bz2
Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdemultimedia-extras.spec 21 Jul 2006 13:18:37 -0000 1.4
+++ kdemultimedia-extras.spec 28 Sep 2006 20:25:28 -0000 1.5
@@ -22,7 +22,8 @@
BuildConflicts: akode-extras
# debugging: to make sure no extras bits (accidentally) get excluded
%{?debug:BuildConflicts: kdemultimedia-extras = %{epoch}:%{version}}
-%define _with_musicbrainz --with-musicbrainz
+## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
+#define _with_musicbrainz --with-musicbrainz
%define _with_libsamplerate --with-libsamplerate
%define _with_taglib --with-taglib
%endif
@@ -36,18 +37,15 @@
%endif
# distro/release bits
-%if "%{?fedora}" > "2"
+#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
%define _with_gstreamer --with-gstreamer
-%endif
-%if "%{?fedora}" > "4"
+#endif
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
%define gst gstreamer08
BuildRequires: libXxf86vm-devel
# likely only required for nonfree -- Rex
BuildRequires: libXxf86dga-devel
%endif
-%if "%{?rhel}" > "3"
-%define _with_gstreamer --with-gstreamer
-%endif
%define is_release 2
@@ -68,8 +66,8 @@
#if "%{?core}" == "1"
Epoch: 6
#endif
-Version: 3.5.3
-Release: 2%{?dist}%{?kde}
+Version: 3.5.4
+Release: 7%{?dist}%{?kde}
License: GPL
%if "%{?patched:1}" == "1"
@@ -84,9 +82,10 @@
BuildRequires: kdelibs-devel >= 6:%{version}
Requires: kdelibs >= 6:%{version}
%if "%{is_release}" != "1"
-BuildRequires: automake
+BuildRequires: automake libtool
%endif
+BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel
@@ -210,6 +209,7 @@
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
+
DO_NOT_COMPILE=""
#{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"}
#{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"}
@@ -226,7 +226,7 @@
--disable-gcc-hidden-visibility \
--enable-new-ldflags \
--disable-debug --disable-warnings \
- --disable-dependancy-tracking --enable-final \
+ --disable-dependency-tracking --enable-final \
--without-libltdl \
--with-alsa --with-arts-alsa \
--with-audiofile \
@@ -274,10 +274,9 @@
done
#if "%{?juk:1}" == "1"
-desktop-file-install --vendor="fedora" \
- --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
- --add-category="X-Fedora" \
+desktop-file-install \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+ --add-category="X-Fedora" --vendor="" \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop
#endif
@@ -302,7 +301,7 @@
# -extras bits
rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akodearts.mcop{class,type}
rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode{,MPC,SpeexStream,VorbisStream,Xiph}PlayObject.mcopclass
-rm -f $RPM_BUILD_ROOT%{_libdir}/libarts_akode.{la,so}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libarts_akode.*
%if "%{?debug}" == "1"
# Conflicts check (debuging only)
find $RPM_BUILD_ROOT -type f -o -type l| sed -e "s|$RPM_BUILD_ROOT||" | while read FILE
@@ -337,15 +336,46 @@
fi
mv %{name}.lang %{name}.list
+# Handle .la, .so files (v0.6)
+[ ! -f %{name}.list ] && echo "%defattr(-,root,root,-)" > %{name}.list
+[ ! -f devel.list ] && echo "%defattr(-,root,root,-)" > devel.list
+for solib in ${RPM_BUILD_ROOT}%{_libdir}/*.so* ; do
+ soname=$(basename ${solib})
+ base=$(basename ${soname} .so)
+ if [ -L ${solib} ]; then
+ if [ "${soname}" == "${base}.so" ]; then
+ echo "%{_libdir}/${soname}" >> devel.list
+ if [ -f ${RPM_BUILD_ROOT}%{_libdir}/${base}.la ]; then
+ ## Should be able to omit these, but that's not always true -- Rex
+ #echo "%exclude %{_libdir}/${base}.la" >> devel.list
+ echo "%{_libdir}/${base}.la" >> devel.list
+ fi
+ else
+ echo "%{_libdir}/${soname}" >> %{name}.list
+ fi
+ else
+ if [ -f ${RPM_BUILD_ROOT}%{_libdir}/${base}.la ]; then
+ ## Should be safe since we patched kdelibs, but that not always true (either) -- Rex
+ #echo "%exclude %{_libdir}/${base}.la" >> %{name}.list
+ echo "%{_libdir}/${base}.la" >> %{name}.list
+ fi
+ echo "%{_libdir}/${soname}" >> %{name}.list
+ fi
+done
-[ ! -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"
@@ -393,8 +423,7 @@
%files -f %{name}.list
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
-%{_libdir}/lib*.so*
-%{_libdir}/lib*.la
+%{_libdir}/lib*.*
%{_bindir}/*
# Own dir(s) until owned by kdelibs? -- Rex
%{_sysconfdir}/xdg/menus/applications-merged/
@@ -411,7 +440,7 @@
%{_libdir}/mcop/*
%{_libdir}/kde3/*
-%files devel -f devel.list
+%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%endif
@@ -440,6 +469,31 @@
%changelog
+* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
+- -extras: drop --with-musicbrainz (for now)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-6
+- try to cleverly move lib*.so bits to -devel (and try to avoid bug #202944)
+- -extras: --with-musicbrainz (using libtunepimp-0.4.x, we'll deal with
+ the hairball that is libtunepimp-0.5 later)
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-5
+- -extras: drop --with-musicbrainz (until juk is fixed for libtunepimp-0.5)
+
+* 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
+
+* Tue Aug 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-2
+- -extras-nonfree: omit libarts_akode.so.0*
+
+* Tue Jul 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-1
+- kde-3.5.4
+
* Fri Jun 02 2006 Rex Dieter 6:3.5.3-2
- use -patched source
- borrow fc's -config.patch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 21 Jul 2006 13:20:00 -0000 1.5
+++ sources 28 Sep 2006 20:25:28 -0000 1.6
@@ -1 +1 @@
-52bb137a4605a35e56ec9dc1070e0e28 kdemultimedia-3.5.3-patched.tar.bz2
+3cf5d9173232cadcf9042d7a60605de3 kdemultimedia-3.5.4-patched.tar.bz2