X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=rc-scripts.spec;h=7f13cce013e32a80f30ab2d20104953cb6df6d84;hb=1e1b42744113cf09ad951b390cb0fef013cae180;hp=395787ebead98d6571958a2297c88922c6e71f81;hpb=8eefd4901b2c404c11a8bdf96b507ab598787164;p=packages%2Frc-scripts.git diff --git a/rc-scripts.spec b/rc-scripts.spec index 395787e..7f13cce 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -8,20 +8,21 @@ Summary(fr.UTF-8): inittab et scripts /etc/rc.d Summary(pl.UTF-8): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts -Version: 0.4.5.4 -Release: 1 +Version: 0.4.15 +Release: 5 License: GPL v2 Group: Base #Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz -# Source0-md5: e073e75ca6220e463bd659d25feefde6 +# Source0-md5: 6acdba8a0df67f4cdbfcfd78a0512017 Source1: rc-local.service Source2: sys-chroots.service Source3: %{name}.tmpfiles +Patch0: %{name}-git.patch URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts BuildRequires: autoconf BuildRequires: automake -BuildRequires: gettext-devel +BuildRequires: gettext-tools BuildRequires: glib2-devel %{?with_static:BuildRequires: glib2-static} %{?with_static:BuildRequires: glibc-static} @@ -39,11 +40,12 @@ Requires: /bin/basename Requires: /bin/gettext Requires: /bin/nice Requires: /bin/ps -Requires: virtual(init-daemon) Requires: SysVinit-tools >= 2.88-1 Requires: blockdev Requires: coreutils Requires: ethtool +Requires: run-parts = %{version}-%{release} +Requires: virtual(init-daemon) %if "%{pld_release}" == "ac" Requires: filesystem >= 3.0-11 %else @@ -56,20 +58,21 @@ Requires: grep Requires: hostname Requires: iproute2 Requires: iputils-arping +Requires: libutempter >= 1.1.6-2 Requires: mingetty Requires: mktemp Requires: mount >= 2.12 Requires: procps >= 1:3.2.6-1.1 Requires: psmisc >= 22.5-2 -Requires: utempter -Requires: util-linux +Requires: util-linux >= 2.22.1 Requires: virtual(module-tools) Suggests: libcgroup -Provides: initscripts Obsoletes: initscripts Obsoletes: vserver-rc-scripts Conflicts: LPRng < 3.8.0-2 Conflicts: dev < 2.9.0-22 +# character classes support required +Conflicts: mawk < 1.3.4-0.20090727 Conflicts: iputils-arping < 2:s20070202-1 Conflicts: openssh-server < 2:3.6.1p2-6 Conflicts: psacct < 6.3.5-10 @@ -79,14 +82,15 @@ Conflicts: udev-core < 1:135-2 %else Conflicts: udev-core < 1:124-3 %endif +Conflicts: SysVinit < 2.88-16 Conflicts: lvm2 < 2.02.83 -Conflicts: upstart-SysVinit < 2.86-25 +Conflicts: upstart Conflicts: wpa_supplicant < 0.6.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _exec_prefix / %define localedir /etc/sysconfig/locale -%define _bindir /bin +%define _bindir /bin %define _sbindir /sbin %description @@ -115,12 +119,23 @@ düzgün bir şekilde kapatmak için gereken dosyaları içerir. Ayrıca pek çok bilgisayar ağı arayüzlerini etkinleştiren ya da edilginleştiren programcıklar içerir. +%package -n run-parts +Summary: run scripts or programs in a directory +Group: Base +Conflicts: %{name} < 0.4.14-2 + +%description -n run-parts +run-parts runs all the executable files named within constraints +described below, found in directory directory. Other files and +directories are silently ignored. + %prep %setup -q +%patch0 -p1 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch: #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic" -sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt"#' configure.ac +sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpthread"#' configure.ac %build %{__aclocal} @@ -135,7 +150,8 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt"#' c %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \ - $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles \ + $RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \ + $RPM_BUILD_ROOT{%{_sysconfdir},%{_prefix}/lib}/sysctl.d \ $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}} %{__make} install \ @@ -186,14 +202,13 @@ done ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d # systemd -install %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/local.service -install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service -install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service +cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf -%if "%{pld_release}" == "ac" -rm -rf $RPM_BUILD_ROOT/etc/init -%endif +# packaged into SysVinit and systemd-init (supported options differ) +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5 %clean rm -rf $RPM_BUILD_ROOT @@ -215,7 +230,17 @@ chown root:root /var/cache/rc-scripts/msg.cache # move network interfaces description files to new location %triggerpostun -- initscripts -mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces +[ -d /etc/sysconfig/network-scripts ] || exit 0 +cd /etc/sysconfig/network-scripts +for iface in ifcfg-* ; do + [ -f $iface ] || continue + if [ -f /etc/sysconfig/interfaces/$iface ]; then + echo "/etc/sysconfig/interfaces/$iface renamed to /etc/sysconfig/interfaces/$iface.rpmnew" + mv -f /etc/sysconfig/interfaces/$iface{,.rpmnew} + fi + echo "/etc/sysconfig/network-scripts/$iface moved to /etc/sysconfig/interfaces/$iface" + mv -f /etc/sysconfig/network-scripts/$iface /etc/sysconfig/interfaces +done %files %defattr(644,root,root,755) @@ -233,20 +258,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces /etc/init.d /etc/rc.d/init.d/functions -%if "%{pld_release}" != "ac" -%config(noreplace) %verify(not md5 mtime size) /etc/init/allowlogin.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/cpusets.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/cryptsetup.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/local.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/modules.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/random.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/rc.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS-sulogin.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/rcS.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/sys-chroots.conf -%config(noreplace) %verify(not md5 mtime size) /etc/init/udev.conf -%endif - %attr(754,root,root) /etc/rc.d/init.d/allowlogin %attr(754,root,root) /etc/rc.d/init.d/cpusets %attr(754,root,root) /etc/rc.d/init.d/cryptsetup @@ -290,7 +301,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces %attr(755,root,root) %{_bindir}/doexec %attr(755,root,root) %{_bindir}/ipcalc %attr(755,root,root) %{_bindir}/resolvesymlink -%attr(755,root,root) %{_bindir}/run-parts %attr(755,root,root) %{_bindir}/usleep %attr(755,root,root) %{_sbindir}/consoletype @@ -337,6 +347,7 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces /lib/rc-scripts/ifup-routes %attr(755,root,root) /lib/rc-scripts/ifup-sl %attr(755,root,root) /lib/rc-scripts/ifup-vlan +%attr(755,root,root) /lib/rc-scripts/makepid /lib/rc-scripts/functions.network /lib/rc-scripts/functions @@ -377,6 +388,9 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes6 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system +%dir %{_sysconfdir}/sysctl.d +%dir %{_prefix}/lib/sysctl.d + %{_mandir}/man?/* %lang(de) %{_mandir}/de/man?/* %lang(es) %{_mandir}/es/man?/* @@ -384,7 +398,15 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces %lang(ja) %{_mandir}/ja/man?/* %lang(ru) %{_mandir}/ru/man?/* %lang(sv) %{_mandir}/sv/man?/* +%exclude %{_mandir}/man8/run-parts.8* %dir %{localedir} %lang(de) %{localedir}/de %lang(pl) %{localedir}/pl + +%files -n run-parts +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/run-parts +# deprecated shell version, packaged for quick fix if something broken. will be dropped soon +%attr(755,root,root) %{_bindir}/run-parts.sh +%{_mandir}/man8/run-parts.8*