[vdirsyncer] Initial import (#1197436)

Michele Baldessari mbaldessari at fedoraproject.org
Mon Mar 2 19:53:36 UTC 2015


commit da6193bc1d470ca614965a97d70af525d6fc51b6
Author: Michele Baldessari <michele at acksyn.org>
Date:   Mon Mar 2 20:53:27 2015 +0100

    Initial import (#1197436)

 .gitignore           |   1 +
 docs-build-fix.patch |  12 +++++
 sources              |   1 +
 system-urllib3.patch |  12 +++++
 vdirsyncer.spec      | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 155 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c94375b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/vdirsyncer-0.4.3.tar.gz
diff --git a/docs-build-fix.patch b/docs-build-fix.patch
new file mode 100644
index 0000000..1b29ea2
--- /dev/null
+++ b/docs-build-fix.patch
@@ -0,0 +1,12 @@
+diff -up vdirsyncer-0.4.2/docs/conf.py.orig vdirsyncer-0.4.2/docs/conf.py
+--- vdirsyncer-0.4.2/docs/conf.py.orig	2015-02-03 13:51:02.752981614 +0100
++++ vdirsyncer-0.4.2/docs/conf.py	2015-02-03 13:51:14.600814066 +0100
+@@ -19,7 +19,7 @@ copyright = (u'2014-{}, Markus Unterwadi
+ 
+ try:
+     # The full version, including alpha/beta/rc tags.
+-    release = pkg_resources.require('vdirsyncer')[0].version
++    release = "0.4.2"
+ except pkg_resources.DistributionNotFound:
+     print('To build the documentation, the distribution information of '
+           'vdirsyncer has to be available. Run "setup.py develop" to do '
diff --git a/sources b/sources
index e69de29..7f02a0f 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2fd8d41ffebee61d3e0162d14f39d983  vdirsyncer-0.4.3.tar.gz
diff --git a/system-urllib3.patch b/system-urllib3.patch
new file mode 100644
index 0000000..b28f2fc
--- /dev/null
+++ b/system-urllib3.patch
@@ -0,0 +1,12 @@
+diff -up vdirsyncer-0.4.0/vdirsyncer/utils/__init__.py.urllib3 vdirsyncer-0.4.0/vdirsyncer/utils/__init__.py
+--- vdirsyncer-0.4.0/vdirsyncer/utils/__init__.py.urllib3	2015-01-05 11:19:18.034400161 +0100
++++ vdirsyncer-0.4.0/vdirsyncer/utils/__init__.py	2015-01-05 11:19:00.784288397 +0100
+@@ -11,7 +11,7 @@ import os
+ import threading
+ 
+ import requests
+-from requests.packages.urllib3.poolmanager import PoolManager
++from urllib3.poolmanager import PoolManager
+ 
+ from .compat import iteritems, urlparse
+ from .. import exceptions, log
diff --git a/vdirsyncer.spec b/vdirsyncer.spec
new file mode 100644
index 0000000..0262620
--- /dev/null
+++ b/vdirsyncer.spec
@@ -0,0 +1,129 @@
+# invoke with "--with tests" to enable tests, currently disabled
+# as we need to package both wsgi_intercept and pytest-localserver
+# for them to work. Will also need BR: pystest once the two
+# above packages exit in Fedora
+
+%bcond_with tests
+
+Name:       vdirsyncer
+Version:    0.4.3
+Release:    5%{?git_tag}%{?dist}
+Summary:    Synchronize calendars and contacts
+
+License:    MIT
+URL:        https://github.com/untitaker/%{name}
+Source0:    https://github.com/untitaker/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+# Make sure we use the system urllib3 as python-requests in Fedora is patched to use that
+Patch0:     system-urllib3.patch
+Patch1:     docs-build-fix.patch
+BuildArch:  noarch
+
+BuildRequires:  python-atomicwrites
+BuildRequires:  python-click
+BuildRequires:  python-devel
+BuildRequires:  python-icalendar
+BuildRequires:  python-setuptools
+BuildRequires:  python-sphinx
+BuildRequires:  python-sphinx_rtd_theme
+
+Requires:       python-requests-toolbelt >= 0.3.0
+Requires:       python-icalendar
+Requires:       python-click
+Requires:       python-atomicwrites
+
+%description
+vdirsyncer synchronizes your calendars and address books between two entities.
+The supported protocols are CalDAV, CardDAV, arbitrary HTTP resources and some
+more.
+
+It aims to be for CalDAV and CardDAV what OfflineIMAP is for IMAP.
+
+%package doc
+Summary:        Documentation for vdirsyncer
+
+%description doc
+The vdirsyncer-doc package provides all the documentation
+for the vdirsyncer calendar/address-book synchronization utility.
+
+%prep
+%setup -q
+%patch0 -p1 -b .urllib3
+%patch1 -p1 -b .man
+
+%build
+%{__python} setup.py --quiet build
+# Custom sphinx docs need to import vdirsyncer classes from the untarred
+# source tree
+export PYTHONPATH=`pwd`
+cd docs
+# NOT using smp_mflags because sphinx cannot really cope with it
+# i.e. one out of 20 builds will misteriously fail
+make SPHINXBUILD=sphinx-build man html text
+cd ..
+unset PYTHONPATH
+# Remove extra copy of text docs
+rm -vrf docs/_build/html/_sources
+rm -fv docs/_build/html/{.buildinfo,objects.inv}
+
+%install
+%{__python} setup.py --quiet install -O1 --skip-build --root $RPM_BUILD_ROOT
+install -d "$RPM_BUILD_ROOT%{_mandir}/man1"
+cp -r docs/_build/man/%{name}.1 "$RPM_BUILD_ROOT%{_mandir}/man1"
+
+%check
+%if %{with tests}
+sh build.sh tests
+%endif
+
+
+%files
+%doc LICENSE AUTHORS.rst README.rst CONTRIBUTING.rst example.cfg
+%{python_sitelib}/*
+%{_bindir}/vdirsyncer
+%{_mandir}/man1/%{name}.1.*
+
+# Still one rpmlint warning due to BZ 1107813 	
+# W: wrong-file-end-of-line-encoding /usr/share/doc/vdirsyncer-doc/html/_static/jquery.js 
+%files doc
+%doc docs/_build/html docs/_build/text
+
+%changelog
+* Mon Mar 02 2015 Michele Baldessari <michele at redhat.com> - 0.4.3-5
+- Disable python3 for now until khal supports it
+
+* Sun Mar 01 2015 Michele Baldessari <michele at redhat.com> - 0.4.3-4
+- Port to python3
+
+* Sun Mar 01 2015 Michele Baldessari <michele at redhat.com> - 0.4.3-3
+- Split out a -doc subpackage as fedora-review complained
+
+* Sat Feb 28 2015 Michele Baldessari <michele at redhat.com> - 0.4.3-2
+- Conditional test builds
+
+* Mon Feb 23 2015 Michele Baldessari <michele at redhat.com> - 0.4.3-1
+- New upstream
+
+* Wed Feb 11 2015 Michele Baldessari <michele at redhat.com> - 0.4.2-3
+- Add html and text documentation
+
+* Wed Feb 04 2015 Michele Baldessari <michele at redhat.com> - 0.4.2-2
+- Add python-atomicwrites dependency
+
+* Tue Feb 03 2015 Michele Baldessari <michele at redhat.com> - 0.4.2-1
+- New upstream
+
+* Mon Jan 05 2015 Michele Baldessari <michele at redhat.com> - 0.4.0-2
+- Force use of system urllib3
+
+* Mon Jan 05 2015 Michele Baldessari <michele at redhat.com> - 0.4.0-1
+- New upstream
+
+* Mon Jan 05 2015 Michele Baldessari <michele at redhat.com> - 0.3.4-2
+- Added python-icalendar and python-click Requires
+
+* Mon Dec 15 2014 Michele Baldessari <michele at redhat.com> - 0.3.4-1
+- New upstream
+
+* Wed Oct 01 2014 Michele Baldessari <michele at redhat.com> - 0.3.0-1
+- Initial packaging


More information about the scm-commits mailing list