--- rpms/dehydrated/sme10/dehydrated.spec	2017/01/06 23:00:25	1.2
+++ rpms/dehydrated/sme10/dehydrated.spec	2018/02/16 22:37:42	1.5
@@ -1,15 +1,15 @@
 Name:		dehydrated
-Version:	0.3.0.20160914.gitcaeed7d
-Release:	4%{?dist}
+Version:	0.5.0
+%define release 1
+Release:	%{release}%{?dist}
 Summary:	ACME client in bash
 
 Group:		Application/System
 License:	MIT
 URL:		https://github.com/lukas2511/dehydrated
-Source0:	dehydrated-master.zip
-Source1:	dehydrated_hooks
-SOurce2:	dehydrated_revoke
-Source3:	httpd.sh.sample
+#download released zip and prepend dehydrated- to name
+Source0:	dehydrated-v0.5.0.tar.gz
+Source1: 	integration.tgz
 
 BuildArch:	noarch
 BuildRoot:	/var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -36,7 +36,11 @@ This is a client for signing certificate
 relatively simple bash-script.
 
 %prep
-%setup -q -n dehydrated-master
+#unpack source 1
+%setup  -n dehydrated-%{version}
+# unpack integration package aka source 1; do not delete previous -D, and disable default unpacking -T
+# this wil unpack the integration file in the previous unpacked dehydrated folder
+%setup -T -D -a 1 
 
 %build
 sed -i -e "s|#BASEDIR=.*|BASEDIR=%{_localstatedir}/lib/%{name}/certificates|" \
@@ -49,11 +53,11 @@ sed -i -e "s|#BASEDIR=.*|BASEDIR=%{_loca
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/challenges
 install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/certificates
 install -D dehydrated $RPM_BUILD_ROOT/%{_bindir}/%{name}
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/dehydrated_hooks
-install %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/dehydrated_revoke
+install integration/dehydrated_hooks $RPM_BUILD_ROOT/%{_bindir}/dehydrated_hooks
+install integration/dehydrated_revoke $RPM_BUILD_ROOT/%{_bindir}/dehydrated_revoke
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/hooks_deploy_cert.d
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/hooks_clean_challenge.d
-install -D -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/hooks_deploy_cert.d/10httpd.sh.sample
+install -D -m 0644 integration/httpd.sh.sample $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/hooks_deploy_cert.d/10httpd.sh.sample
 install -D -m 0644 docs/examples/config $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config
 install -D -m 0644 docs/examples/domains.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/domains.txt
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/
@@ -140,12 +144,13 @@ fi
 
 %files
 %doc LICENSE README.md docs/examples/hook.sh
-%config(noreplace) %{_sysconfdir}/%{name}/*
+%dir %attr(0755,root,root) %{_sysconfdir}/%{name}/hooks_clean_challenge.d/
+%attr(0644, root,root) %{_sysconfdir}/%{name}/hooks_deploy_cert.d/*
+%config(noreplace) %{_sysconfdir}/%{name}/domains.txt
+%config(noreplace) %{_sysconfdir}/%{name}/config
 %config(noreplace) %attr(0755,root,root) %{_sysconfdir}/cron.daily/%{name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%attr(0644, root,root) %{_sysconfdir}/%{name}/hooks_deploy_cert.d/*
-%dir %attr(0755,root,root) %{_sysconfdir}/%{name}/hooks_clean_challenge.d/
 %attr(0755,root,root) %{_bindir}/%{name}
 %attr(0755,root,root) %{_bindir}/dehydrated_hooks
 %attr(0755,root,root) %{_bindir}/dehydrated_revoke
@@ -153,8 +158,20 @@ fi
 %dir %attr(0750,root,root) %{_localstatedir}/lib/%{name}/certificates
 
 %changelog
+* Fri Feb 16 2018 Jean-Philipe Pialasse <tests@pialasse.com> 0.5.0-1.sme
+- upgrade to upstream version [SME: 10521]
+
+* Fri Feb 10 2017 Jean-Philipe Pialasse <tests@pialasse.com> - 0.4.0-1.sme
+- update architecture of sources and release/version number
+- according to Charlie Brady recomendations
+- see [SME 9901] 
+* Mon Feb 06 2017 Jean-Philipe Pialasse <tests@pialasse.com> - 0.4.0.20170205.git1163864.sme
+- update dehydrated to 0.4 [SME: 10080]
+- see https://github.com/lukas2511/dehydrated/releases/tag/v0.4.0
+- upstream release Version 0.4.0 commit 116386486b3749e4c5e1b4da35904f30f8b2749b
+
 * Fri Jan 06 2017 Jean-Philipe Pialasse <tests@pialasse.com> - 0.3.0.20160914.gitcaeed7d-4.sme
-- Initial import in SME Server Buildsys 
+- Initial import in SME Server Buildsys [SME: 9901]
 
 * Mon Oct 24 2016 Daniel Berteaud <daniel@firewall-services.com> - 0.3.0.20160914.gitcaeed7d-3
 - Fix warning when installing dehydrated without upgrading from letsencrypt.sh