From da747c76ef18214f727dfe0fb9dd6612a31357a13652c29bfed2725f9eeba6f2 Mon Sep 17 00:00:00 2001 From: Malcolm Lewis <malcolmlewis@linuxmail.org> Date: Fri, 14 May 2021 02:25:39 +0000 Subject: [PATCH] Accepting request 892592 from home:dirkmueller:Factory - update to 20.11.1: * Escape single quote in LUKS password when unlocking device * Filters: Save filter order changes when clicking OK * Filters: Save changes after Include/Exclude radio is toggled * Filters: Save changes immediately after a pattern is added or edited * Filters: Save changes before showing Summary * Fix #497, #467: Fix missing hourly backups * Move config file to /etc/timeshift/timeshift.json * Move default config to /etc/timeshift/default.json * AppStream: Install only under /usr/share/metainfo. Don't install under /usr/share/appdata/ * Option to unmark snapshots that are marked for deletion * Launcher: No need to pass DISPLAY and AUTHORITY to pkexec * Remove unused functions and code * Update translations - drop timeshift-fix-timeshift-launcher.patch (upstream) OBS-URL: https://build.opensuse.org/request/show/892592 OBS-URL: https://build.opensuse.org/package/show/Archiving:Backup/timeshift?expand=0&rev=6 --- _service | 17 ----------------- timeshift-20.03.obscpio | 3 --- timeshift-fix-timeshift-launcher.patch | 12 ------------ timeshift.changes | 19 +++++++++++++++++++ timeshift.spec | 14 ++++++-------- v20.11.1.tar.gz | 3 +++ 6 files changed, 28 insertions(+), 40 deletions(-) delete mode 100644 _service delete mode 100644 timeshift-20.03.obscpio delete mode 100644 timeshift-fix-timeshift-launcher.patch create mode 100644 v20.11.1.tar.gz diff --git a/_service b/_service deleted file mode 100644 index 7516561..0000000 --- a/_service +++ /dev/null @@ -1,17 +0,0 @@ -<services> - <service mode="disabled" name="obs_scm"> - <param name="url">https://github.com/teejee2008/timeshift.git</param> - <param name="scm">git</param> - <param name="submodules">enable</param> - <param name="revision">refs/tags/v20.03</param> - <param name="filename">timeshift</param> - <param name="versionformat">@PARENT_TAG@</param> - <param name="versionrewrite-pattern">v(.*)</param> - </service> - <service mode="buildtime" name="tar" /> - <service mode="buildtime" name="recompress"> - <param name="file">*.tar</param> - <param name="compression">xz</param> - </service> - <service mode="disabled" name="set_version" /> -</services> diff --git a/timeshift-20.03.obscpio b/timeshift-20.03.obscpio deleted file mode 100644 index abde157..0000000 --- a/timeshift-20.03.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e33131215c0e667e37860555ec8a712168faa9518aa5762964d00326e29a956 -size 4801036 diff --git a/timeshift-fix-timeshift-launcher.patch b/timeshift-fix-timeshift-launcher.patch deleted file mode 100644 index 7466a9c..0000000 --- a/timeshift-fix-timeshift-launcher.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/timeshift-launcher b/src/timeshift-launcher ---- a/src/timeshift-launcher 2020-03-04 21:28:13.000000000 -0600 -+++ b/src/timeshift-launcher 2020-03-05 06:41:59.608255739 -0600 -@@ -18,7 +18,7 @@ - xhost -SI:localuser:root - xhost - elif command -v pkexec >/dev/null 2>&1; then -- pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY ${app_command} -+ pkexec ${app_command} - elif command -v sudo >/dev/null 2>&1; then - x-terminal-emulator -e "sudo ${app_command}" - elif command -v su >/dev/null 2>&1; then diff --git a/timeshift.changes b/timeshift.changes index ff95cdc..49cab34 100644 --- a/timeshift.changes +++ b/timeshift.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed May 12 21:53:13 UTC 2021 - Dirk Müller <dmueller@suse.com> + +- update to 20.11.1: + * Escape single quote in LUKS password when unlocking device + * Filters: Save filter order changes when clicking OK + * Filters: Save changes after Include/Exclude radio is toggled + * Filters: Save changes immediately after a pattern is added or edited + * Filters: Save changes before showing Summary + * Fix #497, #467: Fix missing hourly backups + * Move config file to /etc/timeshift/timeshift.json + * Move default config to /etc/timeshift/default.json + * AppStream: Install only under /usr/share/metainfo. Don't install under /usr/share/appdata/ + * Option to unmark snapshots that are marked for deletion + * Launcher: No need to pass DISPLAY and AUTHORITY to pkexec + * Remove unused functions and code + * Update translations +- drop timeshift-fix-timeshift-launcher.patch (upstream) + ------------------------------------------------------------------- Sun Mar 15 10:23:45 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com> diff --git a/timeshift.spec b/timeshift.spec index c84dae3..2468258 100644 --- a/timeshift.spec +++ b/timeshift.spec @@ -1,7 +1,7 @@ # # spec file for package timeshift # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2017-2020 Malcolm J Lewis <malcolmlewis@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -18,14 +18,12 @@ Name: timeshift -Version: 20.03 +Version: 20.11.1 Release: 0 Summary: System restore utility License: GPL-3.0-only URL: https://teejeetech.in/timeshift/ -Source0: %{name}-%{version}.tar.xz -#PATCH-FIX-OPENSUSE timeshift-fix-timeshift-launcher.patch malcolmlewis@opensuse.org -- Fix `pkexec env` invocation in `timeshift-launcher` is wrong. -Patch0: timeshift-fix-timeshift-launcher.patch +Source0: https://github.com/teejee2008/timeshift/archive/refs/tags/v%{version}.tar.gz BuildRequires: chrpath BuildRequires: fdupes BuildRequires: pkgconfig @@ -60,7 +58,7 @@ using BTRFS tools. chrpath --delete %{buildroot}%{_bindir}/timeshift chrpath --delete %{buildroot}%{_bindir}/timeshift-gtk #Fix file permissions -chmod 0644 %{buildroot}%{_sysconfdir}/default/timeshift.json +chmod 0644 %{buildroot}%{_sysconfdir}/timeshift/default.json chmod 0644 %{buildroot}%{_datadir}/metainfo/timeshift.appdata.xml chmod 0644 %{buildroot}%{_datadir}/timeshift/images/*.svg #Remove as we use rpm/zypper @@ -75,9 +73,9 @@ install -d %{buildroot}%{_localstatedir}/log/timeshift-btrfs %fdupes -s %{buildroot} %files -%doc AUTHORS %license LICENSE.md -%config(noreplace) %{_sysconfdir}/default/timeshift.json +%dir %{_sysconfdir}/timeshift +%config(noreplace) %{_sysconfdir}/timeshift/default.json %{_bindir}/timeshift* %{_datadir}/applications/timeshift-gtk.desktop %{_datadir}/icons/hicolor/*/apps/* diff --git a/v20.11.1.tar.gz b/v20.11.1.tar.gz new file mode 100644 index 0000000..55c5cfe --- /dev/null +++ b/v20.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6dcca80b42f80a8c8d9d03e91eb17aa634be2f1031f667bba3f483410297abb +size 1401165