From b4ca5c6090510458d7995740d27a27433098c3b1 Mon Sep 17 00:00:00 2001 From: John Doe Date: Wed, 21 Dec 2016 23:35:02 +0100 Subject: [PATCH] Initial commit of Back in Time --- Makefile | 1 + files/keyring1.1.12.patch | 24 ++++++++++++++++++++++ files/pkexec1.1.12.patch | 33 ++++++++++++++++++++++++++++++ package.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++ pspec_x86_64.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 158 insertions(+) create mode 100644 Makefile create mode 100644 files/keyring1.1.12.patch create mode 100644 files/pkexec1.1.12.patch create mode 100644 package.yml create mode 100644 pspec_x86_64.xml diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0a42375 --- /dev/null +++ b/Makefile @@ -0,0 +1 @@ +include ../Makefile.common diff --git a/files/keyring1.1.12.patch b/files/keyring1.1.12.patch new file mode 100644 index 0000000..4d4ce45 --- /dev/null +++ b/files/keyring1.1.12.patch @@ -0,0 +1,24 @@ +diff --git a/common/tools.py b/common/tools.py +index e1da01b..c13fb06 100644 +--- a/common/tools.py ++++ b/common/tools.py +@@ -597,6 +597,8 @@ def keyring_supported(): + except: pass + try: backends.append(keyring.backends.kwallet.Keyring) + except: pass ++ try: backends.append(keyring.backends.kwallet.DBusKeyring) ++ except: pass + try: backends.append(keyring.backend.SecretServiceKeyring) + except: pass + try: backends.append(keyring.backend.GnomeKeyring) +@@ -607,9 +609,9 @@ def keyring_supported(): + displayName = keyring.get_keyring().__module__ + except: + displayName = str(keyring.get_keyring()) +- if backends: ++ if backends and isinstance(keyring.get_keyring(), tuple(backends)): + logger.debug("Found appropriate keyring '{}'".format(displayName)) +- return isinstance(keyring.get_keyring(), tuple(backends)) ++ return True + logger.debug("No appropriate keyring found. '{}' can't be used with BackInTime".format(displayName)) + return False diff --git a/files/pkexec1.1.12.patch b/files/pkexec1.1.12.patch new file mode 100644 index 0000000..db15bc0 --- /dev/null +++ b/files/pkexec1.1.12.patch @@ -0,0 +1,33 @@ +diff --git a/qt4/backintime-qt4-root.desktop b/qt4/backintime-qt4-root.desktop +index fef451b..61794c6 100644 +--- a/qt4/backintime-qt4-root.desktop ++++ b/qt4/backintime-qt4-root.desktop +@@ -1,7 +1,7 @@ + [Desktop Entry] + Name=Back In Time (root) + GenericName=Backup +-Exec=pkexec backintime-qt4 ++Exec=/usr/bin/backintime-qt4_polkit %f + Icon=document-save + Terminal=false + X-MultipleArgs=false +diff --git a/qt4/backintime-qt4_polkit b/qt4/backintime-qt4_polkit +new file mode 100644 +index 0000000..4a04190 +--- /dev/null ++++ b/qt4/backintime-qt4_polkit +@@ -0,0 +1,2 @@ ++#!/bin/sh ++pkexec --disable-internal-agent "/usr/bin/backintime-qt4" "$@" +diff --git a/qt4/configure b/qt4/configure +index 68803ca..a96e772 100755 +--- a/qt4/configure ++++ b/qt4/configure +@@ -146,6 +146,7 @@ addNewline + addComment "application" + addInstallDir "/bin" + addInstallFile "backintime-qt4" "/bin" "755" ++addInstallFile "backintime-qt4_polkit" "/bin" "755" + addNewline + + addComment "dbus service" diff --git a/package.yml b/package.yml new file mode 100644 index 0000000..e03ce2e --- /dev/null +++ b/package.yml @@ -0,0 +1,49 @@ +name : backintime +version : 1.1.12 +release : 1 +source : + - https://github.com/bit-team/backintime/archive/v1.1.12.tar.gz : 76036de6abdf5a2b2fbf66311c369dce7e3755fa778e5f01aa49bc2be68eb9f1 +license : GPL-2.0 +component : PLEASE FILL ME IN +summary : Simple backup system inspired from the Flyback Project and TimeVault. +description: | + Simple backup system inspired from the Flyback Project and TimeVault. + +builddeps: + - python3 + +rundeps : + - rsync +# - dcron # does not work + - cronie + - openssh + - python-keyring + - python3-dbus + - polkit + - libnotify + - python3-qt4 + - libicu + - xdpyinfo + - encfs # optional + - sshfs-fuse # optional + - meld # optional + +setup : | + %patch -p1 < $pkgfiles/keyring1.1.12.patch + %patch -p1 < $pkgfiles/pkexec1.1.12.patch + cd $workdir/common + ./configure --python3 --no-fuse-group + cd $workdir/qt4 + ./configure --python3 + +build : | + cd $workdir/common + %make + cd $workdir/qt4 + %make + +install : | + cd $workdir/common + %make_install + cd $workdir/qt4 + %make_install diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml new file mode 100644 index 0000000..db22586 --- /dev/null +++ b/pspec_x86_64.xml @@ -0,0 +1,51 @@ + + + backintime + + Roland Goers + rolandgoers1985@gmail.com + + GPL-2.0 + PLEASE FILL ME IN + Simple backup system inspired from the Flyback Project and TimeVault. + Simple backup system inspired from the Flyback Project and TimeVault. + + https://solus-project.com/sources/README.Solus + + + backintime + Simple backup system inspired from the Flyback Project and TimeVault. + Simple backup system inspired from the Flyback Project and TimeVault. + + PLEASE FILL ME IN + + /etc/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf + /etc/xdg/autostart/backintime.desktop + /usr/bin + /usr/share/applications/backintime-qt4-root.desktop + /usr/share/applications/backintime-qt4.desktop + /usr/share/backintime + /usr/share/bash-completion/completions/backintime + /usr/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service + /usr/share/doc + /usr/share/icons/hicolor/16x16/actions/show-hidden.svg + /usr/share/icons/hicolor/22x22/actions/show-hidden.svg + /usr/share/icons/hicolor/24x24/actions/show-hidden.svg + /usr/share/icons/hicolor/32x32/actions/show-hidden.svg + /usr/share/icons/hicolor/48x48/actions/show-hidden.svg + /usr/share/icons/hicolor/scalable/actions/show-hidden.svg + /usr/share/locale + /usr/share/man + /usr/share/polkit-1/actions/net.launchpad.backintime.policy + + + + + 2016-12-21 + 1.1.12 + Packaging update + Roland Goers + rolandgoers1985@gmail.com + + + \ No newline at end of file -- 2.11.0