Hello community, here is the log from the commit of package kaffeine for openSUSE:Factory checked in at Wed Apr 29 02:11:23 CEST 2009. -------- --- KDE/kaffeine/kaffeine.changes 2009-04-08 18:06:47.000000000 +0200 +++ kaffeine/kaffeine.changes 2009-04-28 11:53:57.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Apr 28 08:32:10 CEST 2009 - beineri@opensuse.org + +- fix build + +------------------------------------------------------------------- +Mon Apr 27 20:55:01 CEST 2009 - tittiatcoke@gmail.com + +- update to 1.0-pre1; This is the pre-release of the KDE4 version + and is not really intended yet for end-users + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- adjust-mimetypes.diff cs.po dvbaudio-fix-build.patch dvbdata.tar.gz kaffeine-0.8.7.tar.bz2 kaffeine.diff kaffeine-link.diff kaffeine-media.diff kaffeine-quote-subs.patch kaffeine-tmpobject.diff logo.ogg messagebox-dvd.diff mutex.diff pedantic.diff New: ---- desktop-files.diff kaffeine.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.N29475/_old 2009-04-29 01:59:11.000000000 +0200 +++ /var/tmp/diff_new_pack.N29475/_new 2009-04-29 01:59:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kaffeine (Version 0.8.7) +# spec file for package kaffeine (Version 0.9+1.0pre1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,40 +19,20 @@ Name: kaffeine -BuildRequires: cdparanoia kdelibs3-devel xine-devel xine-lib -%if %suse_version > 1001 -BuildRequires: gstreamer010-plugins-base-devel -%else -BuildRequires: gstreamer-plugins-devel -%endif +BuildRequires: libkdepimlibs4-devel Url: http://kaffeine.sourceforge.net/ License: GPL v2 or later Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player -Version: 0.8.7 -Release: 47 -%define rversion %version +Version: 0.9+1.0pre1 +Release: 1 +# http://kaffeine.kde.org/?q=node/22 +Source0: kaffeine.tar.bz2 +Patch: desktop-files.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) -%if %suse_version > 1020 -Requires: %{name}-lang = %{version} -%endif -Provides: kaxtv -Obsoletes: kaxtv -Source0: %name-%rversion.tar.bz2 -Source4: logo.ogg -Source5: cs.po -Source6: dvbdata.tar.gz -Patch0: %name.diff -Patch1: adjust-mimetypes.diff -Patch2: messagebox-dvd.diff -Patch4: mutex.diff -Patch5: kaffeine-media.diff -Patch6: kaffeine-link.diff -Patch8: kaffeine-quote-subs.patch -Patch9: pedantic.diff -Patch10: kaffeine-tmpobject.diff -Patch11: dvbaudio-fix-build.patch +%kde4_runtime_requires +Provides: kde4-kaffeine = 4.2.2.svn951439 +Obsoletes: kde4-kaffeine <= 4.2.2.svn951439 %description Kaffeine plays all files and devices supported by Xine. For example, @@ -65,100 +45,49 @@ -------- J�rgen Kofler <kaffeine@gmx.net> -%package gstreamer -License: GPL v2 or later -Group: Productivity/Multimedia/Video/Players -Summary: Multimedia Player using Gstreamer - -%description gstreamer -This plugin enables Kaffeine to play via the Gstreamer framework -instead of Xine. - -The gstreamer backend can only get used for the visualization of audio -sources. - - - -Authors: --------- - J�rgen Kofler <kaffeine@gmx.net> - -%lang_package %prep -%setup -q -n %name-%rversion +%setup -q -n kaffeine %patch -%patch1 -%patch2 -%patch4 -#%patch5 -%patch6 -%patch8 -%patch9 -%patch10 -%patch11 -cp %SOURCE5 po/ -. /etc/opt/kde3/common_options -update_admin %build -. /etc/opt/kde3/common_options -./configure $configkde --disable-final -make %{?jobs:-j%jobs} -cp %{SOURCE6} images + %cmake_kde4 -d build + %make_jobs %install -. /etc/opt/kde3/common_options -make DESTDIR=${RPM_BUILD_ROOT} $INSTALL_TARGET -# -install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/opt/kde3/share/apps/kaffeine/logo.avi -# -r to get rid of Music -%suse_update_desktop_file -r kaffeine KDE AudioVideo Player Video -rm -rf $RPM_BUILD_ROOT/opt/kde3/share/locale/xx -rm $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/x-mplayer2.desktop -kde_post_install -%find_lang %name - -%post -%run_ldconfig - -%postun -%run_ldconfig -%if %suse_version > 1020 + pushd build + %makeinstall + popd + rm -rf $RPM_BUILD_ROOT/usr/share/locale/x-test + %suse_update_desktop_file kaffeine KDE AudioVideo Player Video + %kde_post_install + %find_lang kaffeine -%files lang -f %name.lang +%post -p /sbin/ldconfig -%files -%else +%postun -p /sbin/ldconfig -%files -f %name.lang -%endif -%defattr(-,root,root) -/opt/kde3/bin/* -/opt/kde3/include/kaffeine -/opt/kde3/%_lib/lib* -/opt/kde3/%_lib/kde3/libxinepart.* -/opt/kde3/%_lib/kde3/libkaffeineoggvorbis.* -/opt/kde3/share/appl*/*/* -/opt/kde3/share/apps/kaffeine -/opt/kde3/share/apps/konqueror -/opt/kde3/share/apps/profiles -/opt/kde3/share/icons/* -/opt/kde3/share/mimelnk/*/*.desktop -/opt/kde3/share/services/xine_part.desktop -/opt/kde3/share/services/kaffeineoggvorbis.desktop -/opt/kde3/share/servicetypes/kaffeineaudioencoder.desktop -/opt/kde3/share/servicetypes/kaffeinedvbplugin.desktop -/opt/kde3/share/servicetypes/kaffeineepgplugin.desktop +%clean +rm -rf $RPM_BUILD_ROOT -%files gstreamer +%files -f kaffeine.lang %defattr(-,root,root) -%if %suse_version > 1000 -/opt/kde3/%_lib/kde3/libgstreamerpart.* -/opt/kde3/share/apps/gstreamerpart -/opt/kde3/share/services/gstreamer_part.desktop -%endif +/usr/bin/kaffeine +%_kde_share_dir/apps/kaffeine +/usr/share/applications/kde4/kaffeine.desktop +%dir %_kde_share_dir/apps/solid +%dir %_kde_share_dir/apps/solid/actions +%_kde_share_dir/apps/solid/actions/kaffeine_play_audiocd.desktop +%_kde_share_dir/apps/solid/actions/kaffeine_play_dvd.desktop +%_kde_share_dir/apps/solid/actions/kaffeine_play_videocd.desktop +/usr/share/icons/oxygen/*/actions/audio-radio-encrypted.* +/usr/share/icons/oxygen/*/actions/video-television-encrypted.* %changelog +* Tue Apr 28 2009 beineri@opensuse.org +- fix build +* Mon Apr 27 2009 tittiatcoke@gmail.com +- update to 1.0-pre1; This is the pre-release of the KDE4 version + and is not really intended yet for end-users * Wed Apr 08 2009 llunak@suse.cz - fix build due to uint16_t * Mon Jul 07 2008 dmueller@suse.de ++++++ desktop-files.diff ++++++ --- src/kaffeine.desktop 2009/04/28 06:18:54 1.1 +++ src/kaffeine.desktop 2009/04/28 06:23:47 @@ -45,7 +45,6 @@ GenericName[x-test]=xxMedia Playerxx GenericName[zh_CN]=媒体播放器 Categories=Qt;KDE;AudioVideo;Player; -Icon=kaffeine MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-mplayer2;application/x-quicktime-media-link;application/x-shorten;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg; Terminal=false Type=Application ++++++ kaffeine-0.8.7.tar.bz2 -> kaffeine.tar.bz2 ++++++ ++++ 392451 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org