[packages/letsencrypt.sh: 4/4] Merge remote-tracking branch 'origin/master'

[glen]

commit 6a03632a08b4bebcfef0c281c3239610e3dd810b
Merge: 45bcc7f 598b2b5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat May 14 22:03:49 2016 +0300

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	letsencrypt.sh.spec

 letsencrypt.sh.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --cc letsencrypt.sh.spec
index 029b3d1,d06abad..0aed3c9
--- a/letsencrypt.sh.spec
+++ b/letsencrypt.sh.spec
@@@ -50,18 -48,19 +50,19 @@@ Current features
  
  %install
  rm -rf $RPM_BUILD_ROOT
 -install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{acme-challenges,certs}}
 -install -d $RPM_BUILD_ROOT/etc/cron.d
 +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{acme-challenges,certs},/etc/cron.d}
  
  install -p letsencrypt.sh $RPM_BUILD_ROOT%{_sbindir}
--
  cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
  cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
  cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
  cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
 +cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/letsencrypt
 +install -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}
  cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
  
+ cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/letsencrypt.sh.git/commitdiff/6a03632a08b4bebcfef0c281c3239610e3dd810b