[Frugalware-git] openjava: Merge branch 'master' of ../current

[James Buren]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=3a7c36a9bb251ed7f42df5533230369379c0b281

commit 3a7c36a9bb251ed7f42df5533230369379c0b281
Merge: df3303c eb81d9d
Author: James Buren <ryuo at frugalware.org>
Date:   Mon Jun 11 21:08:46 2012 -0500

Merge branch 'master' of ../current

Conflicts:
source/network/iptables/FrugalBuild
source/network/iptables/iptables.install

diff --cc source/network/iptables/FrugalBuild
index 989bb28,b45499f..0d484e6
--- a/source/network/iptables/FrugalBuild
+++ b/source/network/iptables/FrugalBuild
@@@ -13,11 -13,8 +13,10 @@@ archs=('i686' 'x86_64' 'arm'
backup=(etc/sysconfig/{firewall,iptables})
up2date="lynx -dump http://www.iptables.org/projects/iptables/downloads.html|grep bz2$|sed 's/.*-\(.*\)\.t.*/\1/;q'"
source=(ftp://ftp.netfilter.org/pub/iptables/iptables-$pkgver.tar.bz2 \
- 	rc.firewall rc.firewall-hu.po iptables firewall firewall.libexec firewall.service)
- signatures=($source.sig '' '' '' '' '' '')
- _F_sysvinit_units=(firewall)
+ 	iptables firewall firewall.libexec firewall.service)
+ signatures=($source.sig '' '' '' '')
+_F_systemd_units=(firewall=e)
+Finclude systemd

# As you can see, the /etc/sysconfig/firewall file was generated by
# iptables-save. I used the following commands before using iptables-save:
@@@ -32,10 -29,8 +31,9 @@@ build(
Fbuild --with-kernel=/usr --enable-devel --enable-libipq
Ffile /etc/sysconfig/iptables
Finstall 600 /etc/sysconfig/firewall
- 	Frcd2 firewall
Fexe firewall.libexec /usr/libexec/firewall
Ffile /lib/systemd/system/firewall.service
+	Fgenscriptlet
}

# optimization OK