From 8e832a1ed3d8cdc2bb44cb60a70a048f367fc9dc Mon Sep 17 00:00:00 2001 From: Jonathan G. Underwood Date: Jul 21 2011 00:28:02 +0000 Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/shorewall Conflicts: .gitignore shorewall.spec sources --- diff --git a/.gitignore b/.gitignore index 8086f4a..6f47a0b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,11 @@ shorewall-lite-4.4.11.1.tar.bz2 /shorewall6-lite-4.4.17.tar.bz2 /shorewall-init-4.4.17.tar.bz2 /shorewall-lite-4.4.17.tar.bz2 +/shorewall-4.4.19.4.tar.bz2 +/shorewall6-4.4.19.4.tar.bz2 +/shorewall6-lite-4.4.19.4.tar.bz2 +/shorewall-init-4.4.19.4.tar.bz2 +/shorewall-lite-4.4.19.4.tar.bz2 /shorewall-4.4.21.1.tar.bz2 /shorewall6-4.4.21.1.tar.bz2 /shorewall6-lite-4.4.21.1.tar.bz2 diff --git a/shorewall.spec b/shorewall.spec index 5c63396..928aa05 100644 --- a/shorewall.spec +++ b/shorewall.spec @@ -1,4 +1,4 @@ -%global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{version}/ +%global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{mainver}/ # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0" # which is found at http://www.shorewall.net/Anatomy.html @@ -219,6 +219,7 @@ fi %config(noreplace) %{_sysconfdir}/shorewall/* %config(noreplace) %{_sysconfdir}/logrotate.d/shorewall +<<<<<<< HEAD %{_libexecdir}/shorewall %{_datadir}/shorewall @@ -244,7 +245,6 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/shorewall-lite %{_sysconfdir}/shorewall-lite/Makefile - %{_datadir}/shorewall-lite %{_libexecdir}/shorewall-lite @@ -314,6 +314,9 @@ fi - Update to 4.4.21.1 - Fix BZ 720713 (incorrect init file LSB headers) +* Wed May 25 2011 Orion Poplawski - 4.4.19.4-1 +- Update to 4.4.19.4 + * Sat Mar 5 2011 Jonathan G. Underwood - 4.4.17-2 - Add executable permission to getparams