Commit ff354f07 authored by Michael's avatar Michael

backintime-kde: fixed correct version(s), removed tarball from source array

parent 5f5539f4
......@@ -7,36 +7,27 @@
pkgname=backintime-kde
pkgver=1.0.26
_bzrversion=876
pkgrel=3
pkgrel=4
pkgdesc="Back In Time is a simple backup system for Linux inspired from 'flyback project' and 'TimeVault'. KDE 4 version"
arch=('x86_64')
url="https://launchpad.net/backintime"
license="GPL"
depends=('rsync' 'cron' 'python' 'xorg-utils' 'pyqt' 'kdebindings-python2' 'python2-keyring')
source=("http://backintime.le-web.org/wp-content/uploads/2009/03/backintime-$pkgver.tar.gz"
'fix_spaces_in_anacron_jobs.patch'
'fix_AttributeError_with_python-keyring_gt1.6.1.patch'
'fix_kde4.patch')
md5sums=('76f6fb5f44e04866fd7667f522f6b3d4'
'caa9f7dcdc16442e4f0a4ef28e84f36b'
'2c9bcab4a90f1e5d58773f8ca6912b8e'
'e3775996c91584d10aacb3fb2f13fb62')
makedepends=('bzr')
categories=('utils' 'backup')
#source=("http://backintime.le-web.org/wp-content/uploads/2009/03/backintime-${pkgver}.tar.gz"
source=('fix_spaces_in_anacron_jobs.patch'
'fix_AttributeError_with_python-keyring_gt1.6.1.patch'
'fix_kde4.patch')
sha256sums=('01a43ba204ee91de1490bc9670466c62fd6974d3eea06f77097f43bc59c34b1b'
'5f6f1e28694fc50dfea3ac65f989763642d95606a253c7f6714c99a1f7c778b8'
'7018ac0a97b0d681bcff983c4c9ea4a954e3f76e3be5c4bf842ef1cc74f74585')
_bzrbranch=lp:backintime
_bzrmod=trunk
prepare() {
patch -Np1 -i "${srcdir}/fix_spaces_in_anacron_jobs.patch"
patch -Np1 -i "${srcdir}/fix_kde4.patch"
patch -Np1 -i "${srcdir}/fix_AttributeError_with_python-keyring_gt1.6.1.patch"
}
build() {
msg "Connecting to the server...."
cd ${srcdir}
if [[ -d "$_bzrmod" ]]; then
cd "$_bzrmod" && bzr pull "$_bzrbranch" -r "$_bzrversion"
......@@ -47,23 +38,30 @@ build() {
fi
msg "BZR checkout done or server timeout"
msg "Starting make..."
patch -p0 -i "${srcdir}/fix_spaces_in_anacron_jobs.patch"
patch -p0 -i "${srcdir}/fix_AttributeError_with_python-keyring_gt1.6.1.patch"
patch -p0 -i "${srcdir}/fix_kde4.patch"
}
build() {
msg "Starting make..."
cd $srcdir/$_bzrmod/common
cd "${srcdir}/$_bzrmod/common"
./configure
make || return 1
make
cd $srcdir/$_bzrmod/kde4
cd "${srcdir}/$_bzrmod/kde4"
./configure
make || return 1
make
}
package(){
cd $srcdir/$_bzrmod/common
make DESTDIR=${pkgdir} install || return 1
sed -i -e 's/python/python2/g' ${pkgdir}/usr/bin/backintime
cd "${srcdir}/$_bzrmod/common"
make DESTDIR="${pkgdir}" install
sed -i -e 's/python/python2/g' "${pkgdir}/usr/bin/backintime"
cd $srcdir/$_bzrmod/kde4
make DESTDIR=${pkgdir} install || return 1
sed -i -e 's/python/python2/g' ${pkgdir}/usr/bin/backintime-kde4
cd "${srcdir}/$_bzrmod/kde4"
make DESTDIR="${pkgdir}" install
sed -i -e 's/python/python2/g' "${pkgdir}/usr/bin/backintime-kde4"
}
=== modified file 'common/config.py'
--- a/common/config.py 2013-09-23 18:39:11 +0000
+++ b/common/config.py 2013-10-09 18:34:43 +0000
@@ -582,14 +582,6 @@
diff -Naur trunk/common/config.py trunk.fixed/common/config.py
--- trunk/common/config.py 2013-10-14 14:06:32.104334000 +0000
+++ trunk.fixed/common/config.py 2013-10-14 14:08:29.064564446 +0000
@@ -581,14 +581,6 @@
return False
return True
......@@ -16,21 +16,24 @@
def get_keyring_service_name( self, profile_id = None, mode = None, pw_id = 1 ):
if mode is None:
mode = self.get_snapshots_mode(profile_id)
=== modified file 'common/password.py'
--- a/common/password.py 2013-09-09 19:58:00 +0000
+++ b/common/password.py 2013-10-09 18:34:43 +0000
@@ -249,8 +249,7 @@
diff -Naur trunk/common/password.py trunk.fixed/common/password.py
--- trunk/common/password.py 2013-10-14 14:06:32.104334000 +0000
+++ trunk.fixed/common/password.py 2013-10-14 14:09:52.045739588 +0000
@@ -260,10 +260,9 @@
self.db_keyring = {}
self.db_usr = {}
self.fifo = password_ipc.FIFO(self.config.get_password_cache_fifo())
-
- backend = self.config.get_keyring_backend()
- self.keyring_supported = tools.set_keyring(backend)
-
+
+ self.keyring_supported = tools.keyring_supported()
+
def run(self):
"""
@@ -354,8 +353,7 @@
wait for password request on FIFO and answer with password
@@ -366,8 +365,7 @@
self.fifo = password_ipc.FIFO(self.config.get_password_cache_fifo())
self.db = {}
......@@ -40,11 +43,10 @@
def get_password(self, parent, profile_id, mode, pw_id = 1, only_from_keyring = False):
"""
=== modified file 'common/tools.py'
--- a/common/tools.py 2013-09-23 18:39:11 +0000
+++ b/common/tools.py 2013-10-09 18:34:43 +0000
@@ -500,15 +500,16 @@
diff -Naur trunk/common/tools.py trunk.fixed/common/tools.py
--- trunk/common/tools.py 2013-10-14 14:06:32.104334000 +0000
+++ trunk.fixed/common/tools.py 2013-10-14 14:10:52.776599834 +0000
@@ -500,18 +500,20 @@
if key in env.keys():
env_file.set_str_value(key, env[key])
......@@ -70,10 +72,13 @@
return False
=== modified file 'gnome/app.py'
--- a/gnome/app.py 2013-09-07 13:27:55 +0000
+++ b/gnome/app.py 2013-10-09 18:34:43 +0000
+
class UniquenessSet:
'''a class to check for uniqueness of snapshots of the same [item]'''
def __init__(self, dc = False, follow_symlink = False, list_equal_to = False):
diff -Naur trunk/gnome/app.py trunk.fixed/gnome/app.py
--- trunk/gnome/app.py 2013-10-14 14:06:32.104334000 +0000
+++ trunk.fixed/gnome/app.py 2013-10-14 14:11:30.413799713 +0000
@@ -20,6 +20,7 @@
import os.path
import stat
......@@ -82,10 +87,9 @@
if len( os.getenv( 'DISPLAY', '' ) ) == 0:
os.putenv( 'DISPLAY', ':0.0' )
=== modified file 'gnome/settingsdialog.py'
--- a/gnome/settingsdialog.py 2013-09-11 15:00:58 +0000
+++ b/gnome/settingsdialog.py 2013-10-09 18:34:43 +0000
diff -Naur trunk/gnome/settingsdialog.py trunk.fixed/gnome/settingsdialog.py
--- trunk/gnome/settingsdialog.py 2013-10-14 14:06:32.104334000 +0000
+++ trunk.fixed/gnome/settingsdialog.py 2013-10-14 14:12:15.427770853 +0000
@@ -27,7 +27,6 @@
import datetime
import gettext
......@@ -107,10 +111,9 @@
self.cb_password_save.set_sensitive(self.keyring_supported)
#automatic backup mode store
=== modified file 'kde4/settingsdialog.py'
--- a/kde4/settingsdialog.py 2013-09-12 19:02:08 +0000
+++ b/kde4/settingsdialog.py 2013-10-09 18:34:43 +0000
diff -Naur trunk/kde4/settingsdialog.py trunk.fixed/kde4/settingsdialog.py
--- trunk/kde4/settingsdialog.py 2013-10-14 14:06:32.104334000 +0000
+++ trunk.fixed/kde4/settingsdialog.py 2013-10-14 14:12:52.648298302 +0000
@@ -23,7 +23,6 @@
import gettext
import copy
......@@ -132,4 +135,3 @@
self.cb_password_save.setEnabled(self.keyring_supported)
#mode change
=== modified file 'kde4/app.py'
--- a/kde4/app.py 2013-09-07 13:27:55 +0000
+++ b/kde4/app.py 2013-09-26 00:40:47 +0000
diff -Naur trunk/kde4/app.py trunk.fixed/kde4/app.py
--- trunk/kde4/app.py 2013-10-14 14:06:32.104334000 +0000
+++ trunk.fixed/kde4/app.py 2013-10-14 14:18:24.199666032 +0000
@@ -256,7 +256,7 @@
self.list_files_view.header().setSortIndicatorShown( True )
......
=== modified file 'common/config.py'
--- a/common/config.py 2013-09-09 19:58:00 +0000
+++ b/common/config.py 2013-09-12 18:53:36 +0000
@@ -1271,7 +1271,7 @@
diff -Naur trunk/common/config.py trunk.fixed/common/config.py
--- trunk/common/config.py 2013-10-14 14:06:32.104334000 +0000
+++ trunk.fixed/common/config.py 2013-10-14 14:17:04.978542330 +0000
@@ -1271,7 +1263,7 @@
day = self.get_automatic_backup_day(profile_id)
weekday = self.get_automatic_backup_weekday(profile_id)
weekday = self.get_automatic_backup_weekday(profile_id)
period = str(self.get_automatic_backup_anacron_period(profile_id))
- job_identify = profile_id + '_' + profile_name
+ job_identify = profile_id + '_' + profile_name.replace(' ', '_')
if self.AT_EVERY_BOOT == backup_mode:
cron_line = 'echo "{msg}\n@reboot {cmd}"'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment