Merge pull request bluerail#1 from cbschuld/master

update to 1.5dev22, date fix in change log(invalid), datadir fix in spec...

README.markdown

@@ -1,4 +1,4 @@
-# A Recipe for a haproxy 1.5 development version RPM on CentOS
+# A Recipe for a haproxy 1.5 development version (v22) RPM on CentOS
 
 Perform the following on a build box as a regular user.
 
@@ -12,11 +12,12 @@ Install rpmdevtools from the [EPEL][epel] repository:
 ## Install Prerequisites for RPM Creation
 
     sudo yum groupinstall 'Development Tools'
+    sudo yum install openssl-devel
 
 ## Download haproxy
 
-    wget http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev19.tar.gz
-    mv http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev19.tar.gz ~/rpmbuild/SOURCES/
+    wget http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev22.tar.gz
+    mv http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev22.tar.gz ~/rpmbuild/SOURCES/
 
 ## Get Necessary System-specific Configs
 

spec/haproxy.spec

@@ -7,7 +7,7 @@
 %define haproxy_datadir %{_datadir}/haproxy
 
 %define version 1.5
-%define dev_rel dev19
+%define dev_rel dev22
 %define release 2
 
 Name: haproxy
@@ -109,8 +109,7 @@ fi
 %doc examples/cttproxy-src.cfg
 %doc examples/haproxy.cfg
 %doc examples/tarpit.cfg
-%dir %{haproxy_datadir}
-%dir %{haproxy_datadir}/*
+%{haproxy_datadir}
 %dir %{haproxy_confdir}
 %config(noreplace) %{haproxy_confdir}/%{name}.cfg
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@@ -122,7 +121,10 @@ fi
 %exclude %{_sbindir}/haproxy-systemd-wrapper
 
 %changelog
-* Wed Aug 29 2013 Martijn Storck <[email protected]> - 1.5dev19.2
+* Tue Feb 04 2014 Chris Schuld <[email protected]> - 1.5dev22
+- Update to haproxy 1.5-dev22
+
+* Thu Aug 29 2013 Martijn Storck <[email protected]> - 1.5dev19.2
 - Compile with OpenSSL support
 
 * Wed Aug 28 2013 Martijn Storck <[email protected]> - 1.5dev19.1