[python-carddav] Update to version 0.7.0
Sebastian Dyroff
sdyroff at fedoraproject.org
Fri Feb 27 20:57:33 UTC 2015
commit b4b44aef320995c31193e8db9d64a73dd8796999
Author: Sebastian Dyroff <sdyroff at fedoraproject.org>
Date: Fri Feb 27 21:34:48 2015 +0100
Update to version 0.7.0
.gitignore | 1 +
python-carddav-fedora.txt | 7 +++
python-carddav-remove-shebangs.patch | 94 +++++++++++++++++++++++++-----------
python-carddav.spec | 15 ++++--
sources | 2 +-
5 files changed, 86 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af04845..5259c03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pyCardDAV-0.4.1.tar.gz
+/pyCardDAV-0.7.0.tar.gz
diff --git a/python-carddav-fedora.txt b/python-carddav-fedora.txt
new file mode 100644
index 0000000..b4bc30e
--- /dev/null
+++ b/python-carddav-fedora.txt
@@ -0,0 +1,7 @@
+## README fedora
+
+### Config file format change
+
+Important if you have an old config file from version 0.4.1, it is neccessary
+to convert it to the slightly changed format. The old [dav] section is
+replaced by an [Account <name>] section. See pycard.conf.sample.
diff --git a/python-carddav-remove-shebangs.patch b/python-carddav-remove-shebangs.patch
index 2a44de7..e4b56d6 100644
--- a/python-carddav-remove-shebangs.patch
+++ b/python-carddav-remove-shebangs.patch
@@ -1,42 +1,82 @@
---- pycarddav/backend.py 2013-03-28 13:37:05.000000000 +0100
-+++ pycarddav/backend.py 2013-05-03 12:16:16.137542235 +0200
+diff --git a/pycarddav/__init__.py b/pycarddav/__init__.py
+index eb9c0fe..fa46eeb 100644
+--- a/pycarddav/__init__.py
++++ b/pycarddav/__init__.py
@@ -1,4 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python2
+ # vim: set fileencoding=utf-8 :
+ # Copyright (c) 2011-2014 Christian Geier & contributors
+ #
+diff --git a/pycarddav/backend.py b/pycarddav/backend.py
+index ab1c9ff..342b4f6 100644
+--- a/pycarddav/backend.py
++++ b/pycarddav/backend.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python2
# vim: set ts=4 sw=4 expandtab sts=4:
- # Copyright (c) 2011-2013 Christian Geier & contributors
+ # Copyright (c) 2011-2014 Christian Geier & contributors
#
---- pycarddav/carddav.py 2013-03-28 13:37:05.000000000 +0100
-+++ pycarddav/carddav.py 2013-05-03 12:16:20.922544468 +0200
+diff --git a/pycarddav/carddav.py b/pycarddav/carddav.py
+index fd24c4c..dbdf107 100644
+--- a/pycarddav/carddav.py
++++ b/pycarddav/carddav.py
@@ -1,4 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python2
# vim: set ts=4 sw=4 expandtab sts=4:
- # Copyright (c) 2011-2013 Christian Geier & contributors
+ # Copyright (c) 2011-2014 Christian Geier & contributors
#
---- pycarddav/controllers.py 2013-03-28 13:37:05.000000000 +0100
-+++ pycarddav/controllers.py 2013-05-03 12:16:24.544546159 +0200
+diff --git a/pycarddav/controllers/__init__.py b/pycarddav/controllers/__init__.py
+index 3f19366..b936a7c 100644
+--- a/pycarddav/controllers/__init__.py
++++ b/pycarddav/controllers/__init__.py
@@ -1,4 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python2
# coding: utf-8
# vim: set ts=4 sw=4 expandtab sts=4:
- # Copyright (c) 2011-2013 Christian Geier & contributors
---- pycarddav/__init__.py 2013-03-28 13:37:05.000000000 +0100
-+++ pycarddav/__init__.py 2013-05-03 12:16:26.563547102 +0200
+ # Copyright (c) 2011-2014 Christian Geier & contributors
+diff --git a/pycarddav/controllers/query.py b/pycarddav/controllers/query.py
+index bde9eab..c2c1482 100644
+--- a/pycarddav/controllers/query.py
++++ b/pycarddav/controllers/query.py
@@ -1,4 +1,3 @@
--#!/usr/bin/python
- # vim: set fileencoding=utf-8 :
- # Copyright (c) 2011-2013 Christian Geier & contributors
- #
---- pycarddav/model.py 2013-03-28 13:37:05.000000000 +0100
-+++ pycarddav/model.py 2013-05-03 12:16:29.357548407 +0200
+-#!/usr/bin/env python2
+ # coding: utf-8
+ # vim: set ts=4 sw=4 expandtab sts=4:
+ # Copyright (c) 2011-2014 Christian Geier & contributors
+diff --git a/pycarddav/controllers/sync.py b/pycarddav/controllers/sync.py
+index b3889c5..9e9ed18 100644
+--- a/pycarddav/controllers/sync.py
++++ b/pycarddav/controllers/sync.py
@@ -1,4 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python2
+ # coding: utf-8
# vim: set ts=4 sw=4 expandtab sts=4:
- # Copyright (c) 2011-2013 Christian Geier & contributors
- #
---- pycarddav/ui.py 2013-03-28 13:37:05.000000000 +0100
-+++ pycarddav/ui.py 2013-05-03 12:16:33.819550491 +0200
+ # Copyright (c) 2011-2014 Christian Geier & contributors
+diff --git a/pycarddav/model.py b/pycarddav/model.py
+index 0261607..812ec4d 100644
+--- a/pycarddav/model.py
++++ b/pycarddav/model.py
@@ -1,4 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python2
# vim: set ts=4 sw=4 expandtab sts=4:
- # Copyright (c) 2011-2013 Christian Geier & contributors
+ # Copyright (c) 2011-2014 Christian Geier & contributors
+ #
+diff --git a/pycarddav/ui.py b/pycarddav/ui.py
+index 1b64db1..63f9d8c 100644
+--- a/pycarddav/ui.py
++++ b/pycarddav/ui.py
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python2
+ # vim: set ts=4 sw=4 expandtab sts=4 fileencoding=utf-8:
+ # Copyright (c) 2011-2014 Christian Geier & contributors
#
+diff --git a/setup.py b/setup.py
+index a0e722c..ae47884 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env python2
+-
+ import os
+ import string
+ import subprocess
diff --git a/python-carddav.spec b/python-carddav.spec
index a2c4164..5245258 100644
--- a/python-carddav.spec
+++ b/python-carddav.spec
@@ -2,13 +2,14 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
Name: python-carddav
-Version: 0.4.1
-Release: 6%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
Summary: Python CardDAV client compatible with mutt
License: MIT
URL: http://lostpackets.de/pycarddav/
-Source: http://lostpackets.de/pycarddav/downloads/pyCardDAV-0.4.1.tar.gz
+Source0: http://lostpackets.de/pycarddav/downloads/pyCardDAV-%{version}.tar.gz
+Source1: python-carddav-fedora.txt
Patch0: %{name}-remove-shebangs.patch
BuildArch: noarch
@@ -26,7 +27,8 @@ Python library and front-end for syncing CardDAV
%prep
%setup -q -n pyCardDAV-%{version}
rm -rf pyCardDAV.egg-info
-%patch0
+%patch0 -p1
+cp -p %{SOURCE1} README.fedora
%build
%{__python} setup.py build
@@ -37,7 +39,7 @@ rm -rf pyCardDAV.egg-info
%files
-%doc README.rst README.txt pycard.conf.sample
+%doc README.rst README.fedora pycard.conf.sample
%{python_sitelib}/*
%{_bindir}/pc_query
%{_bindir}/pycard-import
@@ -45,6 +47,9 @@ rm -rf pyCardDAV.egg-info
%changelog
+* Thu Feb 26 2015 Sebastian Dyroff <sdyroff at fedoraproject.org> - 0.7.0-1
+- Bump version to 0.7.0
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 98f7c67..b324ace 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b80804435749ac79e485298e3793eab pyCardDAV-0.4.1.tar.gz
+c99e1a3182c90366e3936339c4cc661b pyCardDAV-0.7.0.tar.gz
More information about the scm-commits
mailing list