From 1b8ba54d875e01c62677eaaf335d57a9a825da11 Mon Sep 17 00:00:00 2001 From: Juan Orti Alcaine Date: May 03 2017 00:56:26 +0000 Subject: Version 2.0.0rc2 --- diff --git a/.gitignore b/.gitignore index 38f340c..e24f894 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Radicale-1.0.1.tar.gz /Radicale-1.1.tar.gz /Radicale-1.1.1.tar.gz +/radicale-2.0.0rc2.tar.gz diff --git a/radicale-0.10-systemwide.patch b/radicale-0.10-systemwide.patch deleted file mode 100644 index d94a135..0000000 --- a/radicale-0.10-systemwide.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit d04f0c33eb74ed8da3ac026c9a6ac893443bc415 -Author: Juan Orti Alcaine -Date: Tue Jan 13 10:29:33 2015 +0100 - - radicale-0.10-systemwide.patch - -diff --git a/config b/config -index a2e36ec..27285b1 100644 ---- a/config -+++ b/config -@@ -17,9 +17,11 @@ - # For example: 0.0.0.0:9999, [::]:9999 - # IPv6 adresses are configured to only allow IPv6 connections - #hosts = 0.0.0.0:5232 -+hosts = 127.0.0.1:5232 - - # Daemon flag - #daemon = False -+daemon = True - - # File storing the PID in daemon mode - #pid = -@@ -29,6 +31,7 @@ - - # SSL certificate path - #certificate = /etc/apache2/ssl/server.crt -+certificate = /etc/pki/tls/certs/localhost.crt - - # SSL private key - #key = /etc/apache2/ssl/server.key -@@ -147,6 +150,7 @@ - - # File for rights management from_file - #file = ~/.config/radicale/rights -+file = /var/lib/radicale/rights - - - [storage] -@@ -164,6 +168,7 @@ - - # Folder for storing local collections, created if not present - #filesystem_folder = ~/.config/radicale/collections -+filesystem_folder = /var/lib/radicale/collections - - # Database URL for SQLAlchemy - # dialect+driver://user:password@host/dbname[?key=value..] -diff --git a/logging b/logging -index f4efb88..b10f88c 100644 ---- a/logging -+++ b/logging -@@ -45,7 +45,7 @@ formatter = simple - [handler_file] - # File handler - class = FileHandler --args = ('/var/log/radicale',) -+args = ('/var/log/radicale/radicale.log',) - formatter = full - - diff --git a/radicale-httpd-python2 b/radicale-httpd-python2 deleted file mode 100644 index 0410c8e..0000000 --- a/radicale-httpd-python2 +++ /dev/null @@ -1,32 +0,0 @@ -# For more information, visit: -# http://radicale.org/user_documentation/#idapache-and-mod-wsgi - -# WARNING: To use this correctly, you will need to set: -# "setsebool -P httpd_can_read_write_radicale=1" - -# -# ServerName cal.localhost - -# WSGIDaemonProcess radicale user=radicale group=radicale threads=1 umask=0027 -# WSGIScriptAlias / /usr/share/radicale/radicale-python2.wsgi - -# -# WSGIProcessGroup radicale -# WSGIApplicationGroup %{GLOBAL} -# AllowOverride None -# -# ## You may want to use apache's authentication -# AuthBasicProvider file -# AuthType Basic -# AuthName "Enter your credentials" -# AuthUserFile /path/to/httpdfile/ -# AuthGroupFile /dev/null -# Require valid-user -# -# RewriteEngine On -# RewriteCond %{REMOTE_USER}%{PATH_INFO} !^([^/]+/)\1 -# RewriteRule .* - [Forbidden] -# -# -# -# diff --git a/radicale-logging_path.patch b/radicale-logging_path.patch new file mode 100644 index 0000000..72e8c6c --- /dev/null +++ b/radicale-logging_path.patch @@ -0,0 +1,13 @@ +diff --git a/logging b/logging +index 250359c..c8bf1e6 100644 +--- a/logging ++++ b/logging +@@ -45,7 +45,7 @@ formatter = simple + [handler_file] + # File handler + class = FileHandler +-args = ('/var/log/radicale',) ++args = ('/var/log/radicale/radicale.log',) + formatter = full + + diff --git a/radicale.service b/radicale.service index 6759ef4..2fbb7a1 100644 --- a/radicale.service +++ b/radicale.service @@ -17,7 +17,7 @@ PrivateDevices=true CapabilityBoundingSet= ProtectSystem=full ProtectHome=true -Restart=always +Restart=on-abnormal [Install] WantedBy=multi-user.target diff --git a/radicale.spec b/radicale.spec index 2abdcae..f5df460 100644 --- a/radicale.spec +++ b/radicale.spec @@ -2,12 +2,12 @@ %global selinux_variants %([ -z "%{selinux_types}" ] && echo mls targeted || echo %{selinux_types}) Name: radicale -Version: 1.1.1 -Release: 11%{?dist} +Version: 2.0.0rc2 +Release: 1%{?dist} Summary: A simple CalDAV (calendar) and CardDAV (contact) server License: GPLv3+ URL: http://radicale.org -Source0: http://pypi.python.org/packages/source/R/Radicale/Radicale-%{version}.tar.gz +Source0: https://github.com/Kozea/Radicale/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.service Source2: %{name}-logrotate Source3: %{name}-httpd @@ -15,15 +15,11 @@ Source4: %{name}.te Source5: %{name}.fc Source6: %{name}.if Source7: %{name}-tmpfiles.conf -Source8: %{name}-httpd-python2 -# Patch0: config adjustments for systemwide installation -Patch0: %{name}-0.10-systemwide.patch +Patch0: radicale-logging_path.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python2-devel -BuildRequires: python2-setuptools BuildRequires: systemd BuildRequires: checkpolicy BuildRequires: selinux-policy-devel @@ -66,8 +62,9 @@ version 3. %package -n python3-%{name} Summary: A simple CalDAV (calendar) and CardDAV (contact) server -Recommends: python3-pam -%{?python_provide:%python_provide python3-%{name}} +Requires: python3-vobject +Provides: python-%{name} = %{version}-%{release} +Obsoletes: python-%{name} < %{version}-%{release} %description -n python3-%{name} The Radicale Project is a CalDAV (calendar) and CardDAV (contact) server. It @@ -80,23 +77,6 @@ MacOS X) and Windows. It is known to work with Evolution, Lightning, iPhone and Android clients. It is free and open-source software, released under GPL version 3. -%package -n python2-%{name} -Summary: A simple CalDAV (calendar) and CardDAV (contact) server -Recommends: python-pam -Recommends: python-ldap -%{?python_provide:%python_provide python2-%{name}} - -%description -n python2-%{name} -The Radicale Project is a CalDAV (calendar) and CardDAV (contact) server. It -aims to be a light solution, easy to use, easy to install, easy to configure. -As a consequence, it requires few software dependencies and is pre-configured -to work out-of-the-box. - -The Radicale Project runs on most of the UNIX-like platforms (Linux, BSD, -MacOS X) and Windows. It is known to work with Evolution, Lightning, iPhone -and Android clients. It is free and open-source software, released under GPL -version 3. - %package httpd Summary: httpd config for Radicale Requires: %{name} = %{version}-%{release} @@ -106,27 +86,12 @@ Requires: python3-mod_wsgi %description httpd httpd example config for Radicale (Python3). -%package httpd-python2 -Summary: httpd config for Radicale -Requires: %{name} = %{version}-%{release} -Requires: python2-%{name} = %{version}-%{release} -Requires: httpd -Requires: mod_wsgi - -%description httpd-python2 -httpd example config for Radicale (Python2). - %prep %autosetup -n Radicale-%{version} mkdir SELinux cp -p %{SOURCE4} %{SOURCE5} %{SOURCE6} SELinux -cp -p radicale.wsgi radicale-python2.wsgi -cp -p radicale.fcgi radicale-python2.fcgi -sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/env python3|' radicale.wsgi -sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/env python3|' radicale.fcgi %build -%py2_build %py3_build cd SELinux for selinuxvariant in %{selinux_variants} @@ -138,26 +103,22 @@ done cd - %install -# %%py3_install first to get python3 version of /usr/bin/radicale %py3_install -%py2_install # Install configuration files mkdir -p %{buildroot}%{_sysconfdir}/%{name}/ install -p -m 640 config %{buildroot}%{_sysconfdir}/%{name}/ install -p -m 644 logging %{buildroot}%{_sysconfdir}/%{name}/ +install -p -m 644 rights %{buildroot}%{_sysconfdir}/%{name}/ # Install wsgi file mkdir -p %{buildroot}%{_datadir}/%{name} -install -p -m 755 radicale-python2.wsgi %{buildroot}%{_datadir}/%{name}/ -install -p -m 755 radicale-python2.fcgi %{buildroot}%{_datadir}/%{name}/ install -p -m 755 radicale.wsgi %{buildroot}%{_datadir}/%{name}/ install -p -m 755 radicale.fcgi %{buildroot}%{_datadir}/%{name}/ # Install apache's configuration file mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf -install -p -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}-python2.conf # Create folder where the calendar will be stored mkdir -p %{buildroot}%{_sharedstatedir}/%{name}/ @@ -221,6 +182,7 @@ fi %dir %{_sysconfdir}/%{name}/ %config(noreplace) %attr(0640, root, %{name}) %{_sysconfdir}/%{name}/config %config(noreplace) %{_sysconfdir}/%{name}/logging +%config(noreplace) %{_sysconfdir}/%{name}/rights %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf @@ -236,22 +198,16 @@ fi %{python3_sitelib}/%{name} %{python3_sitelib}/Radicale-*.egg-info -%files -n python2-%{name} -%license COPYING -%{python2_sitelib}/%{name} -%{python2_sitelib}/Radicale-*.egg-info - %files httpd %{_datadir}/%{name}/%{name}.wsgi %{_datadir}/%{name}/%{name}.fcgi %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%files httpd-python2 -%{_datadir}/%{name}/%{name}-python2.wsgi -%{_datadir}/%{name}/%{name}-python2.fcgi -%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-python2.conf - %changelog +* Wed May 03 2017 Juan Orti Alcaine - 2.0.0rc2 +- Version 2.0.0rc2 +- Drop python2 support + * Sat Feb 11 2017 Fedora Release Engineering - 1.1.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 15dead3..40bd2c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a29dd538377ea24cec83237a636122ae Radicale-1.1.1.tar.gz +SHA512 (radicale-2.0.0rc2.tar.gz) = 8c1e1e7691f67a1863e3a30b99a684d16ccedca6545b7cff84a13211022ce2c72df1ab156c50b24f86153c2bd74d3bf741456fef2f5e8bfe72e1df85b886864c