From 18f4b64fb58aab20a4e524369b027217db36df1b0de840f42d62c133dfe04a7d Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 7 Feb 2011 11:27:43 +0000 Subject: [PATCH] Accepting request 60159 from KDE:Distro:Factory Accepted submit request 60159 from user wstephenson OBS-URL: https://build.opensuse.org/request/show/60159 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=35 --- kaffeine.changes | 7 ++++ kaffeine.spec | 107 +++++++++++++++++++++++++---------------------- 2 files changed, 65 insertions(+), 49 deletions(-) diff --git a/kaffeine.changes b/kaffeine.changes index 7251434..fb9ad2c 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 31 20:52:54 UTC 2011 - asterios.dramis@gmail.com + +- Spec file updates: + * Changes based on rpmdevtools templates and spec-cleaner run. + * Updates in Buildrequires: and %install sections. + ------------------------------------------------------------------- Mon Dec 13 06:01:17 UTC 2010 - coolo@novell.com diff --git a/kaffeine.spec b/kaffeine.spec index ae0298f..436f010 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,7 +1,7 @@ # # spec file for package kaffeine (Version 1.1) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,34 @@ # norootforbuild - Name: kaffeine -BuildRequires: libkdepimlibs4-devel xine-devel -%if %suse_version > 1120 || !0%{?kde_updatedapps} -BuildRequires: libksuseinstall-devel -%endif -Url: http://kaffeine.sourceforge.net/ -License: GPLv2+ -Group: Productivity/Multimedia/Video/Players -Summary: Xine-Based Multimedia Player Version: 1.1 Release: 2 -%define rversion 1.1 -# http://kaffeine.kde.org/?q=node/22 -Source0: kaffeine-%rversion.tar.bz2 -Source1: kaffeine-icons.tar.bz2 +Summary: Xine-Based Multimedia Player + +License: GPLv2+ +Url: http://kaffeine.kde.org/ +Group: Productivity/Multimedia/Video/Players +Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}-icons.tar.bz2 Patch1: kaffeine-fixsplitter.patch Patch2: fix_plasma_startup_error.diff +# PATCH-FIX-OPENSUSE ksuseinstall.diff llunak@novell.com -- Support for on-demand codecs install using ksuseinstall Patch3: ksuseinstall.diff +# PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- Add InitialPreference to set it as the default video player Patch4: initial-preference.diff +# PATCH-FIX-OPENSUSE build-fix.diff -- Build fix for old qt versions Patch5: build-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build + +BuildRequires: libkde4-devel +%if 0%{?suse_version} > 1120 || !0%{?kde_updatedapps} +BuildRequires: libksuseinstall-devel +%endif +BuildRequires: libxine-devel +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif %kde4_runtime_requires %description @@ -47,10 +53,10 @@ MPEG files, AVI (if the codec being used is supported by Xine), MP3, and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards. %prep -%setup -q -n kaffeine-%rversion -b 1 +%setup -q -b 1 %patch1 #%patch2 -%if %suse_version > 1120 || !0%{?kde_updatedapps} +%if 0%{?suse_version} > 1120 || !0%{?kde_updatedapps} %patch3 %endif %patch4 @@ -59,45 +65,48 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards. %endif %build - %cmake_kde4 -d build - %make_jobs +%cmake_kde4 -d build +%make_jobs %install - 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 +pushd build +%kde4_makeinstall +popd -%post -p /sbin/ldconfig +%if 0%{?suse_version} +%suse_update_desktop_file %{name} Qt KDE AudioVideo Player +%endif -%postun -p /sbin/ldconfig +%kde_post_install + +# Removed unneeded locales +%if 0%{?suse_version} < 1130 +rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/ +rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ +%endif +# + +%find_lang %{name} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files -f kaffeine.lang -%defattr(-,root,root) -%_bindir/kaffeine -%_bindir/kaffeine-xbu -#/usr/%_lib/kde4/kaffeinedvb.so -%_kde_share_dir/apps/kaffeine -%_datadir/applications/kde4/kaffeine.desktop -%_datadir/icons/hicolor/*/apps/kaffeine.* -%dir %_kde_share_dir/apps/profiles -%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 -%_datadir/icons/oxygen/*/actions/audio-radio-encrypted.* -%_datadir/icons/oxygen/*/actions/video-television-encrypted.* -%_kde_share_dir/apps/profiles/kaffeine.profile.xml -%dir /usr/share/locale/sr@ijekavian -%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES -%dir /usr/share/locale/sr@ijekavianlatin -%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING COPYING-DOCS Changelog NOTES TODO +%{_bindir}/kaffeine +%{_bindir}/kaffeine-xbu +%{_kde4_applicationsdir}/kaffeine.desktop +%{_kde4_iconsdir}/hicolor/*/apps/kaffeine.* +%{_kde4_iconsdir}/oxygen/*/actions/audio-radio-encrypted.* +%{_kde4_iconsdir}/oxygen/*/actions/video-television-encrypted.* +%{_kde4_appsdir}/kaffeine/ +%dir %{_kde4_appsdir}/profiles +%{_kde4_appsdir}/profiles/kaffeine.profile.xml +%dir %{_kde4_appsdir}/solid +%dir %{_kde4_appsdir}/solid/actions +%{_kde4_appsdir}/solid/actions/kaffeine_play_audiocd.desktop +%{_kde4_appsdir}/solid/actions/kaffeine_play_dvd.desktop +%{_kde4_appsdir}/solid/actions/kaffeine_play_videocd.desktop %changelog