[duplicity] Fix ssl cert enforcement (rhbz#960860)
Rahul Sundaram
sundaram at fedoraproject.org
Mon Dec 30 18:58:09 UTC 2013
commit b1b395600f460e5de5dfe25436fb3960c7b44a39
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date: Mon Dec 30 13:58:03 2013 -0500
Fix ssl cert enforcement (rhbz#960860)
- Fix bogus date in changelog
duplicity.spec | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/duplicity.spec b/duplicity.spec
index 749afca..b08a35a 100644
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -3,7 +3,7 @@
Summary: Encrypted bandwidth-efficient backup using rsync algorithm
Name: duplicity
Version: 0.6.22
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Archiving
URL: http://www.nongnu.org/duplicity/
@@ -12,7 +12,12 @@ Patch0: duplicity-0.6.22-documentation.patch
Requires: python-GnuPGInterface >= 0.3.2, gnupg >= 1.0.6
Requires: openssh-clients, ncftp >= 3.1.9, rsync, python-boto >= 0.9d
Requires: python-paramiko
-BuildRequires: python-devel >= 2.4, librsync-devel >= 0.9.6
+
+%if 0%{?rhel} != 5
+Requires: ca-certificates
+%endif
+
+BuildRequires: python-devel librsync-devel >= 0.9.6
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -39,6 +44,10 @@ but not hard links.
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
+ln -sf %{_sysconfdir}/pki/tls/cert.pem \
+ %{buildroot}/%{_sysconfdir}/%{name}/cacert.pem
+
%find_lang %{name}
%clean
@@ -52,9 +61,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/%{name}*
%{_mandir}/man1/rdiffdir*
%{python_sitearch}/%{name}*
+%{_sysconfdir}/%{name}/cacert.pem
%changelog
-* Wed Dec 26 2013 Robert Scheck <robert at fedoraproject.org> 0.6.22-2
+* Fri Dec 27 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.6.22-3
+- Fix ssl cert enforcement (rhbz#960860)
+- Fix bogus date in changelog
+
+* Thu Dec 26 2013 Robert Scheck <robert at fedoraproject.org> 0.6.22-2
- Added runtime requirement to python-paramiko (#819272, #918933)
* Wed Dec 25 2013 Robert Scheck <robert at fedoraproject.org> 0.6.22-1
More information about the scm-commits
mailing list