diff options
author | Lukas Nykryn <lnykryn@redhat.com> | 2014-04-15 15:19:10 +0200 |
---|---|---|
committer | Lukas Nykryn <lnykryn@redhat.com> | 2014-04-24 13:39:17 +0200 |
commit | 50742d10d095d9d86750e6ae7f97076985145ff0 (patch) | |
tree | cee2fd4336d7b6ff67145afda6f06805d1ca94c2 /initscripts.spec | |
parent | 32e8cbc1c91ada764ef4b5bb817b0c045d3fb3a4 (diff) | |
download | initscripts-50742d10d095d9d86750e6ae7f97076985145ff0.tar initscripts-50742d10d095d9d86750e6ae7f97076985145ff0.tar.gz initscripts-50742d10d095d9d86750e6ae7f97076985145ff0.tar.bz2 initscripts-50742d10d095d9d86750e6ae7f97076985145ff0.tar.xz initscripts-50742d10d095d9d86750e6ae7f97076985145ff0.zip |
move ppp support to ppp package
Diffstat (limited to 'initscripts.spec')
-rw-r--r-- | initscripts.spec | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/initscripts.spec b/initscripts.spec index 68b40284..0c5d0f03 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,8 +1,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts Version: 9.53 -# ppp-watch is GPLv2+, everything else is GPLv2 -License: GPLv2 and GPLv2+ +License: GPLv2 Group: System Environment/Base Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ @@ -29,6 +28,7 @@ Requires: cpio Requires: hostname Conflicts: ipsec-tools < 0.8.0-2 Conflicts: NetworkManager < 0.9.9.0-37.git20140131.el7 +Conflicts: ppp < 2.4.6-3 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig @@ -132,8 +132,6 @@ rm -rf $RPM_BUILD_ROOT /etc/sysconfig/network-scripts/init.ipv6-global %config(noreplace) /etc/sysconfig/network-scripts/ifcfg-lo /etc/sysconfig/network-scripts/ifup-post -/etc/sysconfig/network-scripts/ifdown-ppp -/etc/sysconfig/network-scripts/ifup-ppp /etc/sysconfig/network-scripts/ifup-routes /etc/sysconfig/network-scripts/ifdown-routes /etc/sysconfig/network-scripts/ifup-plip @@ -187,17 +185,8 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/udev/rules.d/* /usr/lib/udev/rename_device /usr/sbin/service -/usr/sbin/ppp-watch %{_mandir}/man*/* %dir %attr(775,root,root) /var/run/netreport -%dir /etc/ppp -%dir /etc/ppp/peers -/etc/ppp/ip-up -/etc/ppp/ip-down -/etc/ppp/ip-up.ipv6to4 -/etc/ppp/ip-down.ipv6to4 -/etc/ppp/ipv6-up -/etc/ppp/ipv6-down %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport |