X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=d62a8f2a5af3d09b13a988e340ad85b66d24d4ce;hb=e717cdd4bef764a4aa7babedc54220b35b04c777;hp=ef5e115d92548d93bd52d52e3d49e48f6dffd53e;hpb=91070d496ce17c5613a940c58b644a797808e37c;p=ipfw-google.git diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec index ef5e115..d62a8f2 100644 --- a/planetlab/ipfwroot.spec +++ b/planetlab/ipfwroot.spec @@ -59,7 +59,8 @@ Group: System Environment/Kernel Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: kernel = %{kernel_version}-%{kernel_release} -Requires: vixie-cron +# in fedora20 cronie does not provide vixie-cronie anymore, just cronie +Requires: cronie Requires: vsys-scripts Obsoletes: ipfw @@ -83,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT %__make KERNELPATH=%kernelpath IPFW_PLANETLAB=1 %install -install -D -m 755 dummynet2/ipfw_mod.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/net/netfilter/ipfw_mod.ko +install -D -m 755 kipfw-mod/ipfw_mod.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/net/netfilter/ipfw_mod.ko install -D -m 755 ipfw/ipfw $RPM_BUILD_ROOT/sbin/ipfw install -D -m 644 planetlab/ipfw.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/ipfw.cron install -D -m 755 planetlab/ipfw $RPM_BUILD_ROOT/etc/rc.d/init.d/ipfw