From dfee3e6eb469cafc15e5fa8b58fba97b0f786dbf Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Nov 17 2016 13:48:19 +0000
Subject: New upstream release


- Added new manpage for hitch.conf
- Updated sed edit of the example config to match values in the test suite
- Added a hack for un-fedora-styling _pkgdocdir on rhel7 builders

---

diff --git a/hitch.spec b/hitch.spec
index a50fbc5..1727bbc 100644
--- a/hitch.spec
+++ b/hitch.spec
@@ -11,11 +11,15 @@
 %global hitch_datadir	%{_datadir}/hitch
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
+# A bug in the rhel7 builders? Looks like they set _pkgdocdir fedora style
+# without version...?
+%{?rhel: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 
 %global _hardened_build 1
 
 Name:		hitch
-Version:	1.4.1
+Version:	1.4.2
 Release:	1%{?dist}
 Summary:	Network proxy that terminates TLS/SSL connections
 
@@ -53,6 +57,7 @@ of connections efficiently on multicore machines.
 %setup -q -n %{name}-%{version}%{?v_rc}
 %patch0
 %patch1
+sed -i ' s/^group =.*/group = "nobody"/ ' hitch.conf.example
 
 %build
 #./bootstrap
@@ -76,15 +81,14 @@ make %{?_smp_mflags}
 
 
 %install
-echo %_docdir
-
 %make_install
 sed   '
-	s/user = ""/user = "%{hitch_user}"/g;
-	s/group = ""/group = "%{hitch_group}"/g;
+	s/user = .*/user = "%{hitch_user}"/g;
+	s/group = .*/group = "%{hitch_group}"/g;
 	s/backend = "\[127.0.0.1\]:8000"/backend = "[127.0.0.1]:6081"/g;
 	s/syslog = off/syslog = on/g;
 	' hitch.conf.example > hitch.conf
+
 %if 0%{?rhel} == 6
 	sed -i 's/daemon = off/daemon = on/g;' hitch.conf
 %endif
@@ -157,6 +161,7 @@ fi
 %license LICENSE
 %endif
 %{_sbindir}/%{name}
+%{_mandir}/man5/hitch.conf.5*
 %{_mandir}/man8/hitch.8*
 %dir %{_sysconfdir}/hitch
 %config(noreplace) %{_sysconfdir}/hitch/hitch.conf
@@ -173,6 +178,12 @@ fi
 
 
 %changelog
+* Thu Nov 17 2016 Ingvar Hagelund <ingvar@redpill-linpro.com> 1.4.2-1
+- New upstream release
+- Added new manpage for hitch.conf
+- Updated sed edit of the example config to match values in the test suite
+- Added a hack for un-fedora-styling _pkgdocdir on rhel7 builders
+
 * Sat Sep 24 2016 Ingvar Hagelund <ingvar@redpill-linpro.com> 1.4.1-1
 - New upstream release