rpms/kdemultimedia-extras/devel .cvsignore, 1.5, 1.6 kdemultimedia-extras.spec, 1.12, 1.13 sources, 1.5, 1.6 kde-libtool.patch, 1.1, NONE kdemultimedia-3.4.0-arts_includes.patch, 1.1, NONE kdemultimedia-3.5.0-116958.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Nov 1 18:33:06 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/kdemultimedia-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4710
Modified Files:
.cvsignore kdemultimedia-extras.spec sources
Removed Files:
kde-libtool.patch kdemultimedia-3.4.0-arts_includes.patch
kdemultimedia-3.5.0-116958.patch
Log Message:
* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.5-0.3
- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg)
* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.5-0.2
- exclude kfile_mpeg from main pkg (it's in -extras-nonfree).
Arguably, doesn't *have* to be marked nonfree, but that's another battle.
* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.5-0.1
- -extras: own %%_datadir/apps/juk/pics
- 3.5.5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 9 Aug 2006 18:41:46 -0000 1.5
+++ .cvsignore 1 Nov 2006 18:32:36 -0000 1.6
@@ -1,3 +1,4 @@
kdemultimedia-3.5.2-patched.tar.bz2
kdemultimedia-3.5.3-patched.tar.bz2
kdemultimedia-3.5.4-patched.tar.bz2
+kdemultimedia-3.5.5-patched.tar.bz2
Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdemultimedia-extras.spec 4 Oct 2006 19:44:29 -0000 1.12
+++ kdemultimedia-extras.spec 1 Nov 2006 18:32:36 -0000 1.13
@@ -31,7 +31,7 @@
%if "%{?nonfree}" == "1"
%define _with_akode --with-akode
BuildRequires: akode-extras
-%define _with_lame --with-lame --disable-lametest
+%define _with_lame --with-lame
%define _with_taglib --with-taglib
%define _with_xine --with-xine
%endif
@@ -66,8 +66,8 @@
#if "%{?core}" == "1"
Epoch: 6
#endif
-Version: 3.5.4
-Release: 8%{?dist}%{?kde}
+Version: 3.5.5
+Release: 0.3%{?dist}%{?kde}
License: GPL
%if "%{?patched:1}" == "1"
@@ -107,8 +107,6 @@
%{?_with_jack:BuildRequires: jack-audio-connection-kit}
%{?_with_polypaudio:BuildRequires: polypaudio-devel}
-Patch0: kde-libtool.patch
-Patch1: kdemultimedia-3.4.0-arts_includes.patch
Patch2: kdemultimedia-3.5.3-config.patch
Patch3: kdemultimedia-3.4.0-xdg.patch
@@ -119,8 +117,6 @@
Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch
# increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744
Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch
-# akode: http://bugs.kde.org/116958
-Patch116958: kdemultimedia-3.5.0-116958.patch
%if "%{?core}" == "1"
%description
@@ -159,7 +155,7 @@
%description
%{summary}, including:
* akode_artsplugin (akode)
-* juk (libtunepimp)
+* juk %{?_with_musicbrainz:(libtunepimp)}
* kfile-plugins: flac, mpc (taglib)
%endif
@@ -189,17 +185,16 @@
%setup -q -n kdemultimedia
%endif
-#patch0 -p1 -b .libtool
-%if "%{version}" < "3.5.3"
-%patch1 -p1 -b .arts_include
-%endif
%patch2 -p1 -b .config
%patch3 -p1 -b .xdg
-#with mpeglib in -extras, not really needed -- Rex
+#with mpeglib in -extras-nonfree, not really needed -- Rex
#patch1000 -p1 -b .oggvorbis_artsplugin
%{?nonfree:%patch74744 -p1 -b .74744}
-%patch116958 -p1 -b .116958
+
+%if "%{?patched:1}" != "1"
+%patch1001 -p1 -b .omit_kfile_mpeg
+%endif
%if "%{is_release}" != "1"
make -f admin/Makefile.common cvs
@@ -220,11 +215,18 @@
%{?extras:export CPPFLAGS="$CPPFLAGS -I%{_includedir}/kde/arts"}
+# -- disable-new-ldflags for nonfree/fc6, since --as-needed fails for lame -- Rex
+# until either binutils or lame (livna bug #1207) is fixed
+
%configure \
--includedir=%{_includedir}/kde \
--disable-rpath \
--disable-gcc-hidden-visibility \
+%if "%{?fedora}" == "6" && "%{?nonfree:1}" == "1"
+ --disable-new-ldflags \
+%else
--enable-new-ldflags \
+%endif
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--without-libltdl \
@@ -273,12 +275,10 @@
make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT -C $module
done
-#if "%{?juk:1}" == "1"
desktop-file-install \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
--add-category="X-Fedora" --vendor="" \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop
-#endif
%if "%{?debug}" == "1"
# Conflicts check (debuging only)
@@ -380,7 +380,7 @@
%if "%{?core}" == "1"
%post
-/sbin/ldconfig
+/sbin/ldconfig ||:
for icon_theme in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
@@ -388,16 +388,16 @@
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
-/sbin/ldconfig
+/sbin/ldconfig ||:
for icon_theme in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-%endif
+%endif
%if "%{?extras}" == "1"
-#if "%{?juk:1}" == "1"
+
%post
for icon_theme in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
@@ -409,13 +409,16 @@
touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done
-#endif
-%endif
+%endif
%if "%{?nonfree}" == "1"
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig ||:
+
+%postun
+/sbin/ldconfig ||:
+
%endif
@@ -440,37 +443,113 @@
%{_libdir}/mcop/*
%{_libdir}/kde3/*
-%files devel
+%files devel -f devel.list
%defattr(-,root,root,-)
%{_includedir}/*
%endif
%if "%{?extras}" == "1"
-%files -f extras.list
+#files -f extras.list
+%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
-%dir %{_datadir}/apps/juk/
+# juk
+%{_bindir}/juk
+%{_datadir}/applications/kde/juk.desktop
+%{_datadir}/apps/juk
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/*/juk*
+%{_datadir}/icons/hicolor/*/*/juk*
+# kfile-plugins
+%{_libdir}/kde3/kfile_flac.*
+%{_libdir}/kde3/kfile_mpc.*
+%{_datadir}/services/kfile_flac.desktop
+%{_datadir}/services/kfile_mpc.desktop
+# akode_artsplugin (free bits)
+%{_libdir}/libarts_akode.[ls][ao]
+%{_libdir}/libarts_akode.so.*
+%{_libdir}/mcop/akodeMPCPlayObject.mcopclass
+%{_libdir}/mcop/akodePlayObject.mcopclass
+%{_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass
+%{_libdir}/mcop/akodeXiphPlayObject.mcopclass
+%{_libdir}/mcop/akodearts.mcopclass
+%{_libdir}/mcop/akodearts.mcoptype
%endif
%if "%{?nonfree}" == "1"
-%files -f nonfree.list
+#files -f nonfree.list
+%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
-%dir %{_datadir}/apps/videothumbnail/
-## FIXME? -- Rex
+%{_bindir}/yaf-cdda
+%{_bindir}/yaf-mpgplay
+%{_bindir}/yaf-splay
+%{_bindir}/yaf-tplay
+%{_bindir}/yaf-vorbis
+%{_bindir}/yaf-yuv
+%{_libdir}/kde3/kfile_mp3.[ls][ao]
+%{_libdir}/kde3/kfile_mpeg.[ls][ao]
+%{_libdir}/kde3/libkrecexport_mp3.[ls][ao]
+%{_libdir}/kde3/videothumbnail.[ls][ao]
+%{_libdir}/libyafcore.[ls][ao]
+%{_libdir}/libyafxplayer.[ls][ao]
+%{_datadir}/apps/videothumbnail/
+%{_datadir}/services/kfile_mp3.desktop
+%{_datadir}/services/kfile_mpeg.desktop
+%{_datadir}/services/krec_exportmp3.desktop
+%{_datadir}/services/videothumbnail.desktop
+
+# (akode|mpeglib|xine)_artsplugin (nonfree bits)
+#files artsplugin
+#defattr(-,root,root,-)
+%{_bindir}/mpeglibartsplay
+%{_libdir}/libarts_mpeglib-0.3.0.so.*
+%{_libdir}/libarts_splay.so.*
+%{_libdir}/libarts_xine.so.*
+%{_libdir}/libmpeg-0.3.0.so
+%{_libdir}/mcop/CDDAPlayObject.mcopclass
+%{_libdir}/mcop/MP3PlayObject.mcopclass
+%{_libdir}/mcop/NULLPlayObject.mcopclass
+%{_libdir}/mcop/OGGPlayObject.mcopclass
+%{_libdir}/mcop/SplayPlayObject.mcopclass
+%{_libdir}/mcop/WAVPlayObject.mcopclass
+%{_libdir}/mcop/akodeMPEGPlayObject.mcopclass
+## FIXME, there has to be a better way of catching/conditionalizing this
+## ie, to determine if akode-extras in use was built with ffmpeg support -- Rex
+%if "%{?fedora}" > "4"
+%{_libdir}/mcop/akodeFFMPEGPlayObject.mcopclass
+%endif
+%{_libdir}/mcop/xineAudioPlayObject.mcopclass
+%{_libdir}/mcop/xineVideoPlayObject.mcopclass
+
+## FIXME -- Rex
+#files devel
+#defattr(-,root,root,-)
+%{_libdir}/libarts_mpeglib.[ls][ao]
+%{_libdir}/libarts_splay.[ls][ao]
+%{_libdir}/libarts_xine.[ls][ao]
+%{_libdir}/libmpeg.[ls][ao]
%{_includedir}/kde/mpeglib/
%{_includedir}/kde/mpeglib_artsplug/
%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
-* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-8
-- respin
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.5-0.3
+- use kdemultimedia-3.5.5-patched.tar.bz2 (from core pkg)
+
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.5-0.2
+- exclude kfile_mpeg from main pkg (it's in -extras-nonfree).
+ Arguably, doesn't *have* to be marked nonfree, but that's another battle.
+
+* Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.5-0.1
+- -extras: own %%_datadir/apps/juk/pics
+- 3.5.5
* Tue Sep 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.4-7
- -extras: drop --with-musicbrainz (for now)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 9 Aug 2006 18:41:46 -0000 1.5
+++ sources 1 Nov 2006 18:32:36 -0000 1.6
@@ -1 +1 @@
-3cf5d9173232cadcf9042d7a60605de3 kdemultimedia-3.5.4-patched.tar.bz2
+7439844e5105091e2b93b3821d999da5 kdemultimedia-3.5.5-patched.tar.bz2
--- kde-libtool.patch DELETED ---
--- kdemultimedia-3.4.0-arts_includes.patch DELETED ---
--- kdemultimedia-3.5.0-116958.patch DELETED ---
More information about the fedora-extras-commits
mailing list