Notification time stamped 2019-04-30 18:57:48 UTC
From b771488483c9b65eedf3dac102504a8a55df8893 Mon Sep 17 00:00:00 2001
From: hannes <hannes(a)fedoraproject.org>
Date: Apr 30 2019 18:57:17 +0000
Subject: Fixed the plugins subpackage
---
diff --git a/backintime.spec b/backintime.spec
index 8416a0c..8797bb8 100644
--- a/backintime.spec
+++ b/backintime.spec
@@ -1,29 +1,27 @@
-%global _python_bytecompile_extra 1
-
Name: backintime
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple backup tool inspired from the Flyback project and TimeVault
License: GPLv2+
URL:
https://github.com/bit-team/backintime
Source0:
https://github.com/bit-team/backintime/releases/download/v%{version}/%{na...
-
BuildArch: noarch
-
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: python-rpm-macros
BuildRequires: python%{python3_pkgversion}-devel
-
-%{?systemd_requires}
BuildRequires: systemd
-
+Requires: %{name}-common = %{version}-%{release}
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
# we place additional icons
Requires: hicolor-icon-theme
# execution of tests
BuildRequires: python%{python3_pkgversion}-nose
BuildRequires: python%{python3_pkgversion}-dbus
+BuildRequires: python%{python3_pkgversion}-qt5-base
BuildRequires: /usr/bin/ssh-agent
BuildRequires: /usr/bin/ps
BuildRequires: /usr/bin/rsync
@@ -33,30 +31,11 @@ Back In Time is a simple backup system for Linux inspired from
“flyback project” and “TimeVault”. The backup is done by taking
snapshots of a specified set of directories.
-%package qt
-Summary: Qt frontend for %{name}
-Requires: %{name}-common = %{version}-%{release}
-Requires: libnotify
-Requires: polkit
-Requires: python%{python3_pkgversion}-qt5
-Requires: python%{python3_pkgversion}-SecretStorage
-Requires: python%{python3_pkgversion}-keyring
-Requires: xorg-x11-utils
-
-Provides: %{name}-qt4 = %{version}-%{release}
-Obsoletes: %{name}-qt4 <= 1.1.24-7
-
-
-%description qt
-Back In Time is a simple backup system for Linux inspired from
-“flyback project” and “TimeVault”. The backup is done by taking
-snapshots of a specified set of directories. This is the package
-providing a Qt5 GUI for backintime.
-
%package common
Summary: Common files for %{name}
Requires: cronie
Requires: openssh-clients
+Requires: python%{python3_pkgversion}-qt5-base
Requires: python%{python3_pkgversion}-keyring
Requires: python%{python3_pkgversion}-dbus
Requires: fuse-sshfs
@@ -66,32 +45,60 @@ Requires: /usr/bin/ssh-agent
Requires: /usr/bin/ps
Requires: /usr/bin/rsync
-Provides: %{name}-common = %{version}-%{release}
-Obsoletes: %{name}-common <= 1.1.24-7
-
-Provides: %{name}-plugins = %{version}-%{release}
-Obsoletes: %{name}-plugins <= 1.1.24-7
-
%description common
Back In Time is a simple backup system for Linux inspired from
“flyback project” and “TimeVault”. The backup is done by taking
snapshots of a specified set of directories.
+This package contains non GUI files for %{name}.
-%prep
-%setup -q -n %{name}-%{version}
+%package plugins
+Summary: Plugins for %{name}
+Requires: %{name}-common = %{version}-%{release}
+Provides: backintime-notify = %{version}-%{release}
+Obsoletes: backintime-notify < 1.1.12-1
+%description plugins
+%summary}.
+
+%package qt
+Summary: Qt frontend for %{name}
+Requires: %{name}-common = %{version}-%{release}
+Requires: libnotify
+Requires: polkit
+Requires: python%{python3_pkgversion}-PyQt5
+Requires: python%{python3_pkgversion}-SecretStorage
+Requires: python%{python3_pkgversion}-keyring
+Requires: xorg-x11-utils
+Provides: backintime-gnome = %{version}-%{release}
+Obsoletes: backintime-gnome < 1.1.12-1
+Provides: backintime-kde = %{version}-%{release}
+Obsoletes: backintime-kde < 1.1.12-1
+Provides: %{name}-qt4 = %{version}-%{release}
+Obsoletes: %{name}-qt4 <= 1.1.24-7
+
+Recommends: %{name}-plugins
+
+%description qt
+BackInTime is a simple backup system for Linux inspired from
+“flyback project” and “TimeVault”. The backup is done by taking
+snapshots of a specified set of directories.
+
+This package contains the Qt frontend of BackInTime.
+
+
+%prep
+%setup -q
# Fix documentation directories.
sed -i -e "s|'%{name}-common'|'%{name}'|g" common/config.py
sed -i -e "s|%{name}-common|%{name}|g" common/configure qt/configure
%build
-#configure used, but fixed upstream to be able to use configure macro
pushd common
-./configure --no-fuse-group
+%configure
popd
pushd qt
-./configure
+%configure
popd
%make_build -C common
@@ -104,6 +111,10 @@ popd
%make_install -C common
%make_install -C qt
+# Manually invoke the python byte compile macro for each path that needs byte
+# compilation.
+%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/qt
+
%find_lang %{name}
desktop-file-install \
@@ -115,21 +126,21 @@ desktop-file-install \
%{buildroot}%{_datadir}/applications/%{name}-qt-root.desktop
mkdir -p %{buildroot}%{_sbindir}
-cp -p %{buildroot}%{_bindir}/%{name} \
- %{buildroot}%{_sbindir}/%{name}-root
+cp -p %{buildroot}%{_bindir}/%{name}-qt \
+ %{buildroot}%{_sbindir}/%{name}-qt-root
ln -s consolehelper \
- %{buildroot}%{_bindir}/%{name}-root
+ %{buildroot}%{_bindir}/%{name}-qt-root
mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/
-cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-root
+cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-qt-root
USER=root
-PROGRAM=%{_sbindir}/%{name}-root
+PROGRAM=%{_sbindir}/%{name}-qt-root
SESSION=true
EOF
mkdir -p %{buildroot}%{_sysconfdir}/pam.d
-cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-root
+cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-qt-root
#%PAM-1.0
auth include config-util
account include config-util
@@ -137,13 +148,11 @@ session include config-util
EOF
-%check
-# FIXME
-%if 0
-pushd common/test
-nosetests-%{python3_version} -v
-./dummy_test_process.sh
-%endif
+#%check
+#pushd common/test
+#nosetests-%{python3_version} -v
+#./test.sh
+
%post common
%systemd_post %{name}.service
@@ -151,55 +160,46 @@ nosetests-%{python3_version} -v
%postun common
%systemd_preun %{name}.service
-%posttrans common
+%posttrans common
%systemd_postun_with_restart %{name}.service
-%files qt
-%license LICENSE
-%doc %{_docdir}/%{name}/
-%doc %{_docdir}/qt/HTML/en/%{name}/index.docbook
-%{_bindir}/%{name}
-%{_bindir}/%{name}-root
-%{_bindir}/%{name}-qt_polkit
-%{_sbindir}/%{name}-root
-%{_datadir}/applications/%{name}-qt.desktop
-%{_datadir}/applications/%{name}-qt-root.desktop
-%{_datadir}/%{name}/qt
-%{_datadir}/%{name}/plugins/qt*plugin*
-%{_datadir}/%{name}/plugins/__pycache__/qt*plugin*
-%{_datadir}/%{name}/plugins/__pycache__/notify*plugin*
-%{_datadir}/bash-completion/completions/%{name}
-%{_datadir}/icons/hicolor/*/actions/*.svg
-%config(noreplace) %{_sysconfdir}/pam.d/%{name}-root
-%config %{_sysconfdir}/security/console.apps/%{name}-root
-# bugfix: ensure someone owns those folders (not qt?)
-%dir %{_docdir}/qt/HTML/en/%{name}
-%dir %{_docdir}/qt/HTML/en
-%dir %{_docdir}/qt/HTML
-%dir %{_docdir}/qt
-
%files common -f %{name}.lang
-%license LICENSE
-%doc %{_docdir}/%{name}/
-%doc %{_docdir}/%{name}-qt/
+%doc %{_datadir}/doc/%{name}/
%{_sysconfdir}/xdg/autostart/%{name}.desktop
-%{_bindir}/%{name}-qt
+%{_bindir}/%{name}
%{_bindir}/%{name}-askpass
-%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/common/
-%dir %{_datadir}/%{name}/plugins/
-%{_datadir}/%{name}/plugins/user*plugin*
-%{_datadir}/%{name}/plugins/__pycache__/user*plugin*
-%{_datadir}/%{name}/plugins/notify*plugin*
-%{_datadir}/bash-completion/completions/%{name}-qt
-%{_datadir}/dbus-1/system-services/net.launchpad.%{name}.serviceHelper.service
-%{_datadir}/polkit-1/actions/net.launchpad.%{name}.policy
-%{_sysconfdir}/dbus-1/system.d/net.launchpad.%{name}.serviceHelper.conf
+%{_datadir}/bash-completion/completions/backintime
+%{_datadir}/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service
+%{_datadir}/polkit-1/actions/net.launchpad.backintime.policy
+%{_sysconfdir}/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf
%{_mandir}/man1/%{name}*
+%files plugins
+%{_datadir}/%{name}/plugins/
+
+%files qt
+%doc %{_docdir}/%{name}-qt/
+%{_bindir}/%{name}-qt
+%{_bindir}/%{name}-qt-root
+%{_bindir}/%{name}-qt_polkit
+%{_sbindir}/%{name}-qt-root
+%{_datadir}/applications/%{name}-qt.desktop
+%{_datadir}/applications/%{name}-qt-root.desktop
+%{_datadir}/backintime/qt/
+%{_datadir}/icons/hicolor/*/actions/*.svg
+%{_datadir}/bash-completion/completions/backintime-qt
+%{_datadir}/doc/qt/HTML/en/backintime/index.docbook
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}-qt-root
+%config %{_sysconfdir}/security/console.apps/%{name}-qt-root
+
%changelog
-* Sat Apr 27 2019 Johannes Lips <hannes(a)fedoraproject.org> - 1.2-0-1
+* Mon Apr 29 2019 Johannes Lips <hannes(a)fedoraproject.org> - 1.2.0-2
+- fixed bytecompilation
+- readded plugins subpackage
+
+* Sat Apr 27 2019 Johannes Lips <hannes(a)fedoraproject.org> - 1.2.0-1
- update to version 1.2.0
- switch to Qt5
- renamed the Qt4 subpackage and removed the plugins subpackage
https://src.fedoraproject.org/rpms/backintime/c/b771488483c9b65eedf3dac10...