From 22499bbf24b23d44ef9bca8e83aff5ac2706bfa235c20315dae06d5542cd8eb3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 27 Aug 2020 11:33:46 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=49 --- kaffeine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaffeine.spec b/kaffeine.spec index 0163efc..55d4770 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,7 +1,7 @@ # # spec file for package kaffeine # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 331ae2367c330042100a043bb6335a7e8b0e8d8da19fcc9d47436caaacf9a956 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 23 Nov 2020 08:41:03 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=50 --- kaffeine.changes | 5 +++++ kaffeine.spec | 23 ++++------------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/kaffeine.changes b/kaffeine.changes index 5106f8c..c72cd92 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 23 08:40:56 UTC 2020 - Christophe Giboudeaux + +- Spec cleanup + ------------------------------------------------------------------- Wed May 15 11:54:48 UTC 2019 - wbauer@tmo.at diff --git a/kaffeine.spec b/kaffeine.spec index 55d4770..bdb59e5 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -47,10 +47,6 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xscrnsaver) Requires: libQt5Sql5-sqlite Requires: vlc-noX -Requires(post): hicolor-icon-theme -Requires(post): update-desktop-files -Requires(postun): hicolor-icon-theme -Requires(postun): update-desktop-files Recommends: %{name}-lang = %{version} Recommends: vlc-codecs %if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120300) @@ -70,7 +66,7 @@ playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VC %build %cmake_kf5 -d build -%make_jobs +%cmake_build %install %kf5_makeinstall -C build @@ -97,29 +93,18 @@ playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VC %{kf5_find_htmldocs} %endif -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun - %files %license COPYING %doc COPYING-DOCS Changelog NOTES README.md %{_kf5_bindir}/kaffeine -%if 0%{?sle_version} == 120100 -%dir %{_kf5_sharedir}/appdata -%endif -%{_kf5_appstreamdir}/org.kde.kaffeine.appdata.xml %{_kf5_applicationsdir}/org.kde.kaffeine.desktop +%{_kf5_appstreamdir}/org.kde.kaffeine.appdata.xml +%{_kf5_htmldir}/en/ %{_kf5_iconsdir}/hicolor/*/*/* +%{_kf5_mandir}/man1/* %{_kf5_sharedir}/kaffeine/ %{_kf5_sharedir}/profiles/ %{_kf5_sharedir}/solid/actions/ -%{_kf5_htmldir}/en/ -%{_kf5_mandir}/man1/* %files lang -f %{name}.lang From f491b517dd80e7352466ebd01d5bff8ab6ea64ff7110f8f5036217271096422f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 23 Nov 2020 08:46:47 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=51 --- kaffeine.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kaffeine.spec b/kaffeine.spec index bdb59e5..0e2abae 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -28,6 +28,7 @@ Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.x Patch0: kaffeine-fixsplitter.patch BuildRequires: extra-cmake-modules BuildRequires: pkgconfig +BuildRequires: update-desktop-files BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5DocTools) From 5524f7c35cc980ea395cfb0bd40b97850b212a74480d5aa20b383388dadbe4c3 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 1 Jun 2023 07:32:02 +0000 Subject: [PATCH 4/5] Switch to a git snapshot OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=52 --- _service | 14 +++++ _servicedata | 4 ++ kaffeine-2.0.18.tar.xz | 3 -- ...-2.0.18git.20230531T022124~afc6c12.obscpio | 3 ++ kaffeine.changes | 11 ++++ kaffeine.obsinfo | 4 ++ kaffeine.spec | 53 +++++++------------ 7 files changed, 55 insertions(+), 37 deletions(-) create mode 100644 _service create mode 100644 _servicedata delete mode 100644 kaffeine-2.0.18.tar.xz create mode 100644 kaffeine-2.0.18git.20230531T022124~afc6c12.obscpio create mode 100644 kaffeine.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..3decf7d --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + enable + 2.0.18git.%ci~%h + https://invent.kde.org/multimedia/kaffeine.git + git + + + + + *.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..374feb9 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://invent.kde.org/multimedia/kaffeine.git + afc6c121b8cb23c0b1f14ab3c2dd04918d28cc05 \ No newline at end of file diff --git a/kaffeine-2.0.18.tar.xz b/kaffeine-2.0.18.tar.xz deleted file mode 100644 index 5e4d3be..0000000 --- a/kaffeine-2.0.18.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9799a5b7b94a55963f94938b36b8fcb1be3e753b2be110989934ab15386b681 -size 6033112 diff --git a/kaffeine-2.0.18git.20230531T022124~afc6c12.obscpio b/kaffeine-2.0.18git.20230531T022124~afc6c12.obscpio new file mode 100644 index 0000000..8d33f30 --- /dev/null +++ b/kaffeine-2.0.18git.20230531T022124~afc6c12.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02af3951da3c41ef169c13e37cbd2c2832b089ca54b07ce9d64fb3c98a39b6ae +size 13516301 diff --git a/kaffeine.changes b/kaffeine.changes index c72cd92..4e35128 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 01 07:05:39 UTC 2023 - christophe@krop.fr + +- Kaffeine is unmaintained upstream but still has users. Switch to + a git snapshot. Notable changes: + * Drop kdelirc profile + * Don't invoke XScreenSaverSuspend on Wayland (kde#460970) + * Add desktop file name to solid actions + * Fix activating existing window + * src/scanfile.dvb: update to latest database + ------------------------------------------------------------------- Mon Nov 23 08:40:56 UTC 2020 - Christophe Giboudeaux diff --git a/kaffeine.obsinfo b/kaffeine.obsinfo new file mode 100644 index 0000000..479cf2b --- /dev/null +++ b/kaffeine.obsinfo @@ -0,0 +1,4 @@ +name: kaffeine +version: 2.0.18git.20230531T022124~afc6c12 +mtime: 1685499684 +commit: afc6c121b8cb23c0b1f14ab3c2dd04918d28cc05 diff --git a/kaffeine.spec b/kaffeine.spec index 0e2abae..bced9fc 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,7 +1,7 @@ # # spec file for package kaffeine # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,16 @@ Name: kaffeine -Version: 2.0.18 +Version: 2.0.18git.20230531T022124~afc6c12 Release: 0 Summary: VLC-based Multimedia Player License: GPL-2.0-or-later -Group: Productivity/Multimedia/Video/Players -URL: https://kaffeine.kde.org/ -Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz +URL: https://apps.kde.org/kaffeine/ +Source0: %{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters) Patch0: kaffeine-fixsplitter.patch BuildRequires: extra-cmake-modules +BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: cmake(KF5CoreAddons) @@ -43,16 +43,13 @@ BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(libvlc) +BuildRequires: pkgconfig(libdvbv5) +BuildRequires: pkgconfig(libvlc) >= 3.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xscrnsaver) Requires: libQt5Sql5-sqlite Requires: vlc-noX -Recommends: %{name}-lang = %{version} Recommends: vlc-codecs -%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120300) -BuildRequires: pkgconfig(libdvbv5) -%endif %description Kaffeine is a media player. @@ -67,46 +64,34 @@ playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VC %build %cmake_kf5 -d build + %cmake_build %install %kf5_makeinstall -C build +%find_lang %{name} + +%{kf5_find_htmldocs} + # place desktop entry in video and tv %suse_update_desktop_file -r org.kde.%{name} Qt KDE AudioVideo Video Player TV -%find_lang %{name} --without-kde --with-man -%if 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120200 - # %%kf5_find_htmldocs is only defined since Leap 42.3 - CURDIR=`pwd` - pushd %{buildroot}%{_kf5_htmldir} - for i in *; do - if ! [ -d "%{_datadir}/locale/${i}" ]; then - echo "Removing unsupported translation %{_kf5_htmldir}/${i}" - rm -rf "$i" - elif [ "$i" != "en" ]; then - echo "%doc %lang($i) %{_kf5_htmldir}/${i}" >> $CURDIR/%{name}.lang - fi - done - echo "%doc %lang(uk) %{_kf5_mandir}/uk" >> $CURDIR/%{name}.lang - popd -%else -%{kf5_find_htmldocs} -%endif - %files %license COPYING -%doc COPYING-DOCS Changelog NOTES README.md -%{_kf5_bindir}/kaffeine +%doc README.md +%doc %lang(en) %{_kf5_htmldir}/en/kaffeine/ %{_kf5_applicationsdir}/org.kde.kaffeine.desktop %{_kf5_appstreamdir}/org.kde.kaffeine.appdata.xml -%{_kf5_htmldir}/en/ +%{_kf5_bindir}/kaffeine %{_kf5_iconsdir}/hicolor/*/*/* -%{_kf5_mandir}/man1/* +%{_kf5_mandir}/man1/kaffeine.1%{?ext_man} %{_kf5_sharedir}/kaffeine/ -%{_kf5_sharedir}/profiles/ %{_kf5_sharedir}/solid/actions/ %files lang -f %{name}.lang +%{_kf5_mandir}/*/man1/kaffeine.1%{?ext_man} +%{_kf5_htmldir}/*/kaffeine/ +%exclude %{_kf5_htmldir}/en/ %changelog From 2c4bfaa5af54df8799138f33242cc84fbf53a75321f2b6e43922b8c01d49618f Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 1 Jun 2023 07:37:44 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=53 --- kaffeine.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaffeine.changes b/kaffeine.changes index 4e35128..50d07a0 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -10,7 +10,7 @@ Thu Jun 01 07:05:39 UTC 2023 - christophe@krop.fr * src/scanfile.dvb: update to latest database ------------------------------------------------------------------- -Mon Nov 23 08:40:56 UTC 2020 - Christophe Giboudeaux +Mon Nov 23 08:40:56 UTC 2020 - Christophe Marin - Spec cleanup