Merge pull request #1 from djam/openswan:rosa2016.1

Bacports

.abf.yml

@@ -1,12 +1,3 @@
-removed_sources:
-  openswan-2.6.39.tar.gz: 0100c226ef82222243aba74deeb47bead594fbc2
-  openswan-2.6.41.tar.gz: 98089d87b361184b1667e8c0e1975d7707b0ee1b
-  openswan-2.6.44.tar.gz: e074d5dfec525330a5db724912443636f7679f15
-  openswan-2.6.48.tar.gz: 39ae42a907824d039fd55805e2c3ae5dec9fc9bc
 sources:
-  openswan-2.6.39.tar.gz.asc: 74917d65f6bcdc66d84ca76a14a7ed323b9344eb
-  openswan-2.6.41.tar.gz.asc: 4cbcec60fa1ac7b8813d4bda975c18a722bad0c1
-  openswan-2.6.44.tar.gz.asc: 149bcb348ab548c8b1aa564a4d9b0e6c92e3c68e
-  openswan-2.6.48.tar.gz.asc: 6ff1212ee2523af4ee960fe31be31f3e70c43e21
   openswan-2.6.49.tar.gz: 2175fbe82ea1c88caec2d877c069fa237b7aa122
   openswan-2.6.49.tar.gz.asc: 6fae97dd2f1a71caa645bbcc646d241e8375c422

openswan.spec

@@ -3,7 +3,7 @@
 Summary:	An implementation of IPSEC & IKE for Linux
 Name:		openswan
 Version:	2.6.49
-Release:	1
+Release:	4
 License:	GPLv2+
 Group:		System/Servers
 Url:		http://www.openswan.org/
@@ -13,6 +13,7 @@ Source2:	openswan.service
 Patch0:		openswan-2.6.28-manfix.patch
 BuildRequires:	bison
 BuildRequires:	docbook-dtd412-xml
+BuildRequires:	docbook-dtds
 BuildRequires:	docbook-style-xsl
 BuildRequires:	dos2unix
 BuildRequires:	flex
@@ -95,6 +96,11 @@ This is the documentation for Openswan.
 
 find . -type f -name "*.html" -exec dos2unix {} \;
 
+# Try to workaround messed up man generation on install
+pushd programs/_confread
+cat `cat d.ipsec.conf/order.txt` >ipsec.conf.5.xml
+popd
+
 %build
 %serverbuild