From 6add3d462c038de46f46c1810508c4cf9a3b5590 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Sun, 24 Dec 2017 18:00:05 +0000 Subject: [PATCH 1/3] Accepting request 559743 from home:sogal:branches:utilities - Update desktop database upon ranger installation/removal * Fixed desktop file by adding GenericName entry OBS-URL: https://build.opensuse.org/request/show/559743 OBS-URL: https://build.opensuse.org/package/show/utilities/ranger?expand=0&rev=15 --- ranger-1.8.1.tar.gz | 4 ++-- ranger.changes | 6 ++++++ ranger.desktop.patch | 15 +++++++++++++++ ranger.spec | 15 +++++++++++++-- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 ranger.desktop.patch diff --git a/ranger-1.8.1.tar.gz b/ranger-1.8.1.tar.gz index 8851a57..48ab542 100644 --- a/ranger-1.8.1.tar.gz +++ b/ranger-1.8.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1433f9f9958b104c97d4b23ab77a2ac37d3f98b826437b941052a55c01c721b4 -size 227415 +oid sha256:755c1eac08221ec37515073c3555a34c3e7fb30270985252c763e5a581322784 +size 234971 diff --git a/ranger.changes b/ranger.changes index b209b42..d58b2bf 100644 --- a/ranger.changes +++ b/ranger.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 11 13:04:03 UTC 2017 - sogal@volted.net + +- Update desktop database upon ranger installation/removal + * Fixed desktop file by adding GenericName entry + ------------------------------------------------------------------- Sat Jan 21 23:02:07 UTC 2017 - aloisio@gmx.com diff --git a/ranger.desktop.patch b/ranger.desktop.patch new file mode 100644 index 0000000..7440bd1 --- /dev/null +++ b/ranger.desktop.patch @@ -0,0 +1,15 @@ +--- ranger-1.8.1.orig/doc/ranger.desktop 2017-12-11 13:46:27.000000000 +0100 ++++ ranger-1.8.1/doc/ranger.desktop 2017-12-21 14:33:47.854478237 +0100 +@@ -1,9 +1,11 @@ + [Desktop Entry] + Type=Application + Name=ranger ++GenericName=ranger ++X-SuSE-translate=false + Comment=Launches the ranger file manager + Icon=utilities-terminal + Terminal=true + Exec=ranger +-Categories=ConsoleOnly;System;FileTools;FileManager ++Categories=ConsoleOnly;System;FileTools;FileManager; + MimeType=inode/directory; diff --git a/ranger.spec b/ranger.spec index 4c2a708..32a039c 100644 --- a/ranger.spec +++ b/ranger.spec @@ -1,3 +1,4 @@ +# # spec file for package ranger # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. @@ -15,6 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: ranger @@ -26,6 +28,7 @@ Group: Productivity/File utilities Url: http://ranger.nongnu.org Source: http://nongnu.org/ranger/ranger-%{version}.tar.gz Source99: ranger-rpmlintrc +Patch0: ranger.desktop.patch BuildRequires: python-devel >= 2.5.1 Requires: file Requires: python-curses @@ -62,6 +65,8 @@ though ranger is easily controllable with just the arrow keys or the mouse. %setup -q sed -e 's|#!/bin/python|#!%{_bindir}/env python|' -i doc/tools/convert_papermode_to_metadata.py +%patch0 -p1 + %build python ./setup.py build @@ -72,8 +77,14 @@ python ./setup.py install \ rm -rf "%{buildroot}%{_datadir}/doc/ranger" -%if 0%{?suse_version} -%suse_update_desktop_file -r "%{name}" System FileManager +%if 0%{?suse_version} > 1330 +%post +%desktop_database_post +%endif + +%if 0%{?suse_version} > 1330 +%postun +%desktop_database_postun %endif %files From 5f355e72e64e1d101c375d7f6f7129bedbcfbd44 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Sun, 24 Dec 2017 18:13:20 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/utilities/ranger?expand=0&rev=16 --- ranger.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/ranger.changes b/ranger.changes index d58b2bf..499d86b 100644 --- a/ranger.changes +++ b/ranger.changes @@ -3,6 +3,7 @@ Mon Dec 11 13:04:03 UTC 2017 - sogal@volted.net - Update desktop database upon ranger installation/removal * Fixed desktop file by adding GenericName entry + using ranger.desktop.patch to that effect ------------------------------------------------------------------- Sat Jan 21 23:02:07 UTC 2017 - aloisio@gmx.com From b408e7f42abb48d43df183bea53dfd03b7498dcd Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Wed, 27 Dec 2017 20:17:21 +0000 Subject: [PATCH 3/3] Accepting request 560188 from home:1Antoine1:branches:utilities - Fix wrong conditionals for desktop_database_post(un) calls. OBS-URL: https://build.opensuse.org/request/show/560188 OBS-URL: https://build.opensuse.org/package/show/utilities/ranger?expand=0&rev=17 --- ranger.changes | 9 +++++++-- ranger.spec | 5 ++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ranger.changes b/ranger.changes index 499d86b..8d933ac 100644 --- a/ranger.changes +++ b/ranger.changes @@ -1,9 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 27 18:01:01 UTC 2017 - antoine.belvire@opensuse.org + +- Fix wrong conditionals for desktop_database_post(un) calls. + ------------------------------------------------------------------- Mon Dec 11 13:04:03 UTC 2017 - sogal@volted.net - Update desktop database upon ranger installation/removal - * Fixed desktop file by adding GenericName entry - using ranger.desktop.patch to that effect +- Fixed desktop file by adding GenericName entry using + ranger.desktop.patch ------------------------------------------------------------------- Sat Jan 21 23:02:07 UTC 2017 - aloisio@gmx.com diff --git a/ranger.spec b/ranger.spec index 32a039c..99cc2fe 100644 --- a/ranger.spec +++ b/ranger.spec @@ -28,6 +28,7 @@ Group: Productivity/File utilities Url: http://ranger.nongnu.org Source: http://nongnu.org/ranger/ranger-%{version}.tar.gz Source99: ranger-rpmlintrc +# PATCH-FIX-UPSTREAM ranger.desktop.patch -- Add missing GenericName Patch0: ranger.desktop.patch BuildRequires: python-devel >= 2.5.1 Requires: file @@ -77,12 +78,10 @@ python ./setup.py install \ rm -rf "%{buildroot}%{_datadir}/doc/ranger" -%if 0%{?suse_version} > 1330 +%if 0%{?suse_version} < 1330 %post %desktop_database_post -%endif -%if 0%{?suse_version} > 1330 %postun %desktop_database_postun %endif