rpms/kdemultimedia/devel kdemultimedia-3.5.6-config.patch, NONE, 1.1 kdemultimedia.spec, 1.79, 1.80 kde-libtool.patch, 1.1, NONE kdemultimedia-3.5.3-config.patch, 1.1, NONE

Thu Apr 19 10:34:55 UTC 2007

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9534

Modified Files:
	kdemultimedia.spec 
Added Files:
	kdemultimedia-3.5.6-config.patch 
Removed Files:
	kde-libtool.patch kdemultimedia-3.5.3-config.patch 
Log Message:
- kaboodle, noatun, juk Split into an extra package


kdemultimedia-3.5.6-config.patch:
 kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am |    4 ++--
 kdemultimedia-3.5.6/configure.in                   |    2 +-
 kdemultimedia-3.5.6/configure.in.in                |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE kdemultimedia-3.5.6-config.patch ---
--- kdemultimedia-3.5.6/configure.in.in.orig	2007-04-18 18:57:41.000000000 +0200
+++ kdemultimedia-3.5.6/configure.in.in	2007-04-18 18:58:05.000000000 +0200
@@ -542,7 +542,7 @@
 if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
 	LIB_ARTS="-lartskde"
 	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
-	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
+	ARTS_CFLAGS="-I$ARTS_PREFIX/include/kde/arts"
 	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
 else
 	build_arts="no"
--- kdemultimedia-3.5.6/configure.in.orig	2007-04-18 18:58:18.000000000 +0200
+++ kdemultimedia-3.5.6/configure.in	2007-04-18 18:58:43.000000000 +0200
@@ -607,7 +607,7 @@
 if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
 	LIB_ARTS="-lartskde"
 	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
-	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
+	ARTS_CFLAGS="-I$ARTS_PREFIX/include/kde/arts"
 	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
 else
 	build_arts="no"
--- kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am.config	2005-02-03 23:48:26.000000000 +0100
+++ kdemultimedia-3.4.0-patched/kscd/libwm/Makefile.am	2005-02-28 20:47:00.223979671 +0100
@@ -9,8 +9,8 @@
 
 noinst_LTLIBRARIES  = libworkman.la
 
-libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries)
-libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND)
+libworkman_la_LDFLAGS = $(all_libraries)
+libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTSC_LIBS) $(ARTS_LIBASOUND)
 
 libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\
 database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdemultimedia.spec	12 Mar 2007 13:18:22 -0000	1.79
+++ kdemultimedia.spec	19 Apr 2007 10:34:52 -0000	1.80
@@ -1,18 +1,13 @@
+%define extras 0
+
 %define debug 0
 %define final 0
 %define make_cvs 1
 
-%define qt_version 3.3.7
-
-%define libtool 1
-%define arts 1
-
-%define redhatify 1
-
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 6
 Name: kdemultimedia
 Summary: Multimedia applications for the K Desktop Environment (KDE)
@@ -21,7 +16,8 @@
 License: GPL
 Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
-Patch2: kdemultimedia-3.5.3-config.patch
+
+Patch2: kdemultimedia-3.5.6-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch4: kdemultimedia-3.5.3-examples.patch
 
@@ -36,19 +32,29 @@
 
 BuildRequires: zlib-devel
 BuildRequires: kdebase-devel
-BuildRequires: perl
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: glib2-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libtheora-devel
 BuildRequires: flac-devel
-%if %{make_cvs}
-BuildRequires: autoconf automake libtool
-%endif
 BuildRequires: alsa-lib-devel >= 1.0.2
 BuildRequires: cdparanoia
 BuildRequires: cdparanoia-devel
+BuildRequires: gstreamer-devel
+
+%if %{make_cvs}
+BuildRequires: autoconf automake libtool
+%endif
+
+%if %{extras}
+BuildRequires: taglib-devel
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libtunepimp-devel
+BuildRequires: akode-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: xine-lib-devel >= 0:1.0
+%endif
 
 %description
 The K Desktop Environment (KDE) is a GUI desktop for the X Window
@@ -58,8 +64,6 @@
   kmid, a midi player
   kmix, an audio mixer
   arts, additional functionality for the aRts sound system
-  kaboodle, a media player
-  noatun, a media player
   krec, a recording tool
   kscd, an Audio-CD player
   kaudiocreator, a graphical frontend for audio file creation 
@@ -69,6 +73,7 @@
 Summary: Development files for aRts plugins
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-extras = %{epoch}:%{version}-%{release}
 Requires: kdebase-devel
 
 %description devel
@@ -77,8 +82,20 @@
 applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
 noatun plugins.
 
+%package extras
+Summary: Extras packages from kdemultimedia
+Group: Applications/Multimedia
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description extras
+More multimedia applications for the K Desktop Environment:
+ * juk, a media player
+ * kaboodle, a media player
+ * noatun, a media player
+
 %prep
 %setup -q -n %{name}-%{version}-patched
+
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
 %patch4 -p1 -b .examples
@@ -93,6 +110,11 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
+%if !%{extras}
+  DO_NOT_COMPILE=""
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -103,12 +125,10 @@
    --with-flac \
    --with-theora \
    --with-vorbis \
-%if %{arts} == 0
-   --without-arts \
-%endif
    --with-alsa \
    --with-arts-alsa \
    --with-xinerama \
+   --with-gstreamer \
 %if %{debug} == 0
    --disable-debug \
    --without-debug \
@@ -117,6 +137,12 @@
 %if %{final}
    --enable-final \
 %endif
+%if %{extras}
+   --with-akode \
+   --with-taglib \
+   --with_libsamplerate \
+   --with-xine \
+%endif
    --disable-rpath
 
 
@@ -129,21 +155,45 @@
 make install DESTDIR=%{buildroot}
 make -C kaudiocreator DESTDIR=%{buildroot} install
 
-%if %{redhatify}
-  for f in %{buildroot}%{appdir}/*.desktop ; do
-    if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
-      echo "OnlyShowIn=KDE;" >> $f
-    fi
-  done
-%endif
+# only show in KDE
+for f in %{buildroot}%{appdir}/*.desktop ; do
+  if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
+    echo "OnlyShowIn=KDE;" >> $f
+  fi
+done
 
 # don't make these world-writeable
 chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
 
-cd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   rm -f $i/common
-   ln -sf ../common $i
+# locale's
+%find_lang %{name} || touch %{name}.lang
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
+
+# rpmdocs
+for dir in k* ; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    if test -s "$dir/$file" ; then
+       install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+       # exclude kaboodle, juk, noatun
+       if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then
+         echo "%doc rpmdocs/$dir/" >> %{name}.lang
+       fi
+    fi
+  done
 done
 
 %post
@@ -165,29 +215,96 @@
 %clean
 rm -rf %{buildroot}
 
-%files
-%defattr(-,root,root)
-/etc/xdg/menus/applications-merged/*
+%files extras
+%defattr(-,root,root,-)
+
+# kaboodle
+%doc rpmdocs/kaboodle/
+%doc %lang(en) %{_docdir}/HTML/en/kaboodle/
+%{_bindir}/kaboodle
+%{_libdir}/kde3/libkaboodlepart.*
+%{_datadir}/applications/kde/kaboodle.desktop
+%{_datadir}/apps/kaboodle/
+%{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%{_datadir}/services/kaboodle*
+
+# noatun
+%doc %lang(en) %{_docdir}/HTML/en/noatun/
+%{_bindir}/noatun
+%{_libdir}/kconf_update_bin/noatun20update
+%{_libdir}/kde3/noatun*
+%{_libdir}/libartseffects.*
+%{_libdir}/libkdeinit_noatun.*
+%{_libdir}/libnoatunarts.*
+%{_libdir}/libnoatuncontrols.*
+%{_libdir}/libnoatun.*
+%{_libdir}/libnoatuntags.*
+%{_libdir}/libwinskinvis.*
+%{_datadir}/applications/kde/noatun.desktop
+%{_datadir}/apps/kconf_update/noatun.upd
+%{_datadir}/apps/noatun/
+%{_datadir}/icons/hicolor/*/apps/noatun.png
+%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+
+%if %{extras}
+# juk
+%doc %lang(en) %{_docdir}/HTML/en/juk/
+%{_bindir}/juk
+%{_datadir}/applications/kde/juk.desktop
+%{_datadir}/apps/juk/
+%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%{_datadir}/icons/crystalsvg/*/*/juk*
+%{_datadir}/icons/hicolor/*/apps/juk.png
+%endif
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
 %doc COPYING COPYING-DOCS
-%doc %{_docdir}/HTML/en/artsbuilder
-%exclude %doc %{_docdir}/HTML/en/juk
-%doc %{_docdir}/HTML/en/kaboodle
-%doc %{_docdir}/HTML/en/kaudiocreator
-%doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
-%doc %{_docdir}/HTML/en/kioslave
-%doc %{_docdir}/HTML/en/kmid
-%doc %{_docdir}/HTML/en/kmix
-%doc %{_docdir}/HTML/en/krec
-%doc %{_docdir}/HTML/en/kscd
-%doc %{_docdir}/HTML/en/noatun
+
+# kaboodle
+%exclude %{_docdir}/HTML/en/kaboodle/
+%exclude %{_bindir}/kaboodle
+%exclude %{_libdir}/kde3/libkaboodlepart.*
+%exclude %{_datadir}/applications/kde/kaboodle.desktop
+%exclude %{_datadir}/apps/kaboodle/
+%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png
+%exclude %{_datadir}/services/kaboodle*
+
+# noatun
+%exclude %{_docdir}/HTML/en/noatun/
+%exclude %{_bindir}/noatun
+%exclude %{_libdir}/kconf_update_bin/noatun20update
+%exclude %{_libdir}/kde3/noatun*
+%exclude %{_libdir}/libartseffects.*
+%exclude %{_libdir}/libkdeinit_noatun.*
+%exclude %{_libdir}/libnoatunarts.*
+%exclude %{_libdir}/libnoatuncontrols.*
+%exclude %{_libdir}/libnoatun.*
+%exclude %{_libdir}/libnoatuntags.*
+%exclude %{_libdir}/libwinskinvis.*
+%exclude %{_datadir}/applications/kde/noatun.desktop
+%exclude %{_datadir}/apps/kconf_update/noatun.upd
+%exclude %{_datadir}/apps/noatun/
+%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png
+%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
+
+%if %{extras}
+# juk
+%exclude %{_docdir}/HTML/en/juk/
+%exclude %{_bindir}/juk
+%exclude %{_datadir}/applications/kde/juk.desktop
+%exclude %{_datadir}/apps/juk/
+%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
+%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
+%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
+%endif
+
+/etc/xdg/menus/applications-merged/*
 %{_libdir}/mcop/*
 %{_libdir}/*.la
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.so.*
-%{_libdir}/libartseffects.so
-%{_libdir}/libnoatunarts.so
 %{_libdir}/liboggarts.so
-%{_libdir}/libwinskinvis.so
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin/*
 %{_bindir}/*
@@ -212,6 +329,9 @@
 %exclude %{_libdir}/libwinskinvis.so
 
 %changelog
+* Wed Apr 18 2007 Than Ngo <than at redhat.com> - 6:3.5.6-4.fc7
+- kaboodle, noatun, juk Split into an extra package
+
 * Mon Mar 12 2007 Than Ngo <than at redhat.com> - 6:3.5.6-3.fc7
 - cleanup specfile
 


--- kde-libtool.patch DELETED ---


--- kdemultimedia-3.5.3-config.patch DELETED ---


