Hello community, here is the log from the commit of package backintime for openSUSE:Factory checked in at 2019-05-14 13:41:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/backintime (Old) and /work/SRC/openSUSE:Factory/.backintime.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "backintime" Tue May 14 13:41:02 2019 rev:19 rq:701788 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/backintime/backintime.changes 2017-11-19 11:16:02.205234923 +0100 +++ /work/SRC/openSUSE:Factory/.backintime.new.5148/backintime.changes 2019-05-14 13:41:03.984347605 +0200 @@ -1,0 +2,12 @@ +Mon Apr 29 10:44:25 UTC 2019 - Tim Hardeck <[email protected]> + +- Update to upstream version 1.2.0 + * switch to Qt5 + * rewrite huge parts + * add unit-test for most important parts +- remove obsolete patch backintime-ssh-agent_only_if_password.patch +- remove obsolete patch backintime-security_hardening_backport.patch +- add gpg verification for source tarball +- remove obsolete %post and %postun statements + +------------------------------------------------------------------- Old: ---- backintime-1.1.24.tar.gz backintime-security_hardening_backport.patch backintime-ssh-agent_only_if_password.patch New: ---- backintime-1.2.0.tar.gz backintime-1.2.0.tar.gz.asc backintime.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ backintime.spec ++++++ --- /var/tmp/diff_new_pack.lKQrbk/_old 2019-05-14 13:41:05.048349816 +0200 +++ /var/tmp/diff_new_pack.lKQrbk/_new 2019-05-14 13:41:05.052349825 +0200 @@ -1,7 +1,7 @@ # # spec file for package backintime # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: backintime -Version: 1.1.24 +Version: 1.2.0 Release: 0 Summary: Back In Time is a simple backup tool for Linux, inspired by "flyback project" -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Archiving/Backup Url: https://github.com/bit-team/backintime -Source: https://github.com/bit-team/backintime/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: %{name}.png -# PATCH-FEATURE-OPENSUSE %%{name}-ssh-agent_only_if_password.patch -- [email protected] -Patch0: %{name}-ssh-agent_only_if_password.patch +Source0: https://github.com/bit-team/backintime/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source1: https://github.com/bit-team/backintime/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc +# Public key mentioned in https://github.com/bit-team/backintime#archlinux +Source2: %{name}.keyring +Source3: %{name}.png # PATCH-FEATURE-OPENSUSE %%{name}-polkit_priv_downgrade.patch boo#1007723 -Patch1: %{name}-polkit_priv_downgrade.patch -# PATCH-FIX-UPSTREAM %%{name}-security_hardening_backport.patch boo#1007723 -Patch2: %{name}-security_hardening_backport.patch +Patch0: %{name}-polkit_priv_downgrade.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: python3-devel @@ -39,8 +38,7 @@ Requires: dbus-1-python3 Requires: openssh Requires: python3 -#Not yet available in openSUSE -#Requires: python3-keyring +Requires: python3-keyring Requires: rsync Recommends: encfs Recommends: sshfs @@ -53,7 +51,7 @@ %description Back In Time is a simple backup tool for Linux, inspired by "flyback project". -It provides a command line client 'backintime' and a Qt4 GUI 'backintime-qt4' +It provides a command line client 'backintime' and a Qt5 GUI 'backintime-qt' both written in Python3. You only need to specify 3 things: @@ -61,43 +59,44 @@ * what folders to backup; and * backup frequency (manual, every hour, every day, every month). -%package qt4 -Summary: Back In Time Qt4 GUI +%package qt +Summary: Back In Time Qt5 GUI Group: Productivity/Archiving/Backup Requires: %{name} = %{version} Requires: dbus-1-python3 -Requires: libnotify-tools Requires: polkit -Requires: python3-qt4 +Requires: python3-qt5 +Obsoletes: backintime-qt4 -%description qt4 -This package has a Qt4 GUI for %{name}. +%description qt +This package has a Qt5 GUI for %{name}. %lang_package %prep %setup -q -%patch0 -p1 -%patch1 -%patch2 +%patch0 %build # Fix documentation directories. sed -i -e "s|'doc'|'doc/packages'|g" common/config.py sed -i -e "s|'backintime-common'|'backintime'|g" common/config.py -sed -i -e "s|/share/doc/|/share/doc/packages/|g" common/configure qt4/configure -sed -i -e "s|backintime-common|backintime|g" common/configure qt4/configure +sed -i -e "s|/share/doc/|/share/doc/packages/|g" common/configure qt/configure +sed -i -e "s|backintime-common|backintime|g" common/configure qt/configure # Fix icon name. -sed -i 's/Icon=document-save/Icon=backintime/g' qt4/backintime-qt4.desktop -sed -i 's/Icon=document-save/Icon=backintime/g' qt4/backintime-qt4-root.desktop +sed -i 's/Icon=document-save/Icon=backintime/g' qt/backintime-qt.desktop +sed -i 's/Icon=document-save/Icon=backintime/g' qt/backintime-qt-root.desktop + +# Fix shebangs +sed -i 's|/usr/bin/env python|#!/usr/bin/python|g' common/askpass.py pushd common ./configure --python3 make %{?_smp_mflags} popd -pushd qt4 +pushd qt ./configure --python3 make %{?_smp_mflags} popd @@ -106,36 +105,24 @@ pushd common %make_install popd -pushd qt4 +pushd qt %make_install popd # Remove unmaintained documentation. rm -r %{buildroot}%{_docdir}/qt -install -D -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/%{name}.png +install -D -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/pixmaps/%{name}.png # Fix duplicated files. %fdupes %{buildroot}%{_datadir}/icons/hicolor/ -# Fix executable permissions. -chmod a+x %{buildroot}%{_datadir}/%{name}/common/askpass.py -chmod a+x %{buildroot}%{_datadir}/%{name}/common/bcolors.py -chmod a+x %{buildroot}%{_datadir}/%{name}/common/create-manpage-backintime-config.py -chmod a+x %{buildroot}%{_datadir}/%{name}/common/sshMaxArg.py - -%suse_update_desktop_file %{name}-qt4 System Backup -%suse_update_desktop_file %{name}-qt4-root System Backup +%suse_update_desktop_file %{name}-qt System Backup +%suse_update_desktop_file %{name}-qt-root System Backup %find_lang %{name} --without-kde --without-gnome -%post -%desktop_database_post -%icon_theme_cache_post - %postun -%desktop_database_postun -%icon_theme_cache_postun rm -f %{_sysconfdir}/udev/rules.d/99-backintime-*.rules %files @@ -152,7 +139,7 @@ %{_mandir}/man1/%{name}.1%{ext_man} %{_sysconfdir}/xdg/autostart/backintime.desktop %exclude %{_docdir}/%{name}-*/ -%exclude %{_datadir}/%{name}/qt4 +%exclude %{_datadir}/%{name}/qt %exclude %{_datadir}/%{name}/plugins %files lang -f %{name}.lang @@ -162,13 +149,13 @@ %lang(jv) %dir %{_datadir}/locale/jv/LC_MESSAGES %endif -%files qt4 +%files qt %defattr(-,root,root) -%{_bindir}/%{name}-qt4 -%{_bindir}/%{name}-qt4_polkit -%{_datadir}/applications/%{name}-qt4.desktop -%{_datadir}/applications/%{name}-qt4-root.desktop -%{_datadir}/%{name}/qt4 +%{_bindir}/%{name}-qt +%{_bindir}/%{name}-qt_polkit +%{_datadir}/applications/%{name}-qt.desktop +%{_datadir}/applications/%{name}-qt-root.desktop +%{_datadir}/%{name}/qt %{_datadir}/%{name}/plugins %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/system-services @@ -176,8 +163,8 @@ %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/net.launchpad.backintime.policy -%{_docdir}/%{name}-qt4/ -%{_mandir}/man1/%{name}-qt4.1%{ext_man} +%{_docdir}/%{name}-qt/ +%{_mandir}/man1/%{name}-qt.1%{ext_man} %dir %{_sysconfdir}/dbus-1 %dir %{_sysconfdir}/dbus-1/system.d %config %{_sysconfdir}/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf ++++++ backintime-1.1.24.tar.gz -> backintime-1.2.0.tar.gz ++++++ ++++ 139231 lines of diff (skipped) ++++++ backintime-polkit_priv_downgrade.patch ++++++ --- /var/tmp/diff_new_pack.lKQrbk/_old 2019-05-14 13:41:05.280350298 +0200 +++ /var/tmp/diff_new_pack.lKQrbk/_new 2019-05-14 13:41:05.280350298 +0200 @@ -1,5 +1,5 @@ ---- qt4/net.launchpad.backintime.policy 2016-01-11 19:07:58.000000000 +0100 -+++ qt4/net.launchpad.backintime.policy 2017-03-29 13:45:08.384966405 +0200 +--- qt/net.launchpad.backintime.policy 2016-01-11 19:07:58.000000000 +0100 ++++ qt/net.launchpad.backintime.policy 2017-03-29 13:45:08.384966405 +0200 @@ -14,7 +14,7 @@ <defaults> <allow_any>auth_admin</allow_any> @@ -7,7 +7,7 @@ - <allow_active>auth_admin_keep</allow_active> + <allow_active>auth_admin</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/backintime-qt4</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/backintime-qt</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> @@ -25,8 +25,8 @@ <description gettext-domain="backintime">This will install Udev rules which will start Back In Time if a drive get connected.</description>
