- rel 8

[packages/rc-scripts.git] / rc-scripts.spec

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 5862ece6e07891f210a34286a59df12b7fb36cad..4e434d4141b4297e17aa53a60e7611009b1f291a 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,17 +8,19 @@ 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.2
-Release:       3
+Version:       0.4.5.3
+Release:       8
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: bf27c7699c48598293e166eae364a5e0
-Source1:       rc-scripts-systemd-tmpfiles.d.conf
-Source2:       rc-local.service
+# Source0-md5: ac04b9e70d2bb1583f5ea41dd2d1894e
+Source1:       rc-local.service
+Source2:       sys-chroots.service
+Source3:       %{name}.tmpfiles
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
-Patch0:                %{name}-svn.patch
+Patch0:                %{name}-skip_networkmanager_users_config.patch
+Patch1:                %{name}-svn.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -58,12 +60,12 @@ Requires:   iproute2
 Requires:      iputils-arping
 Requires:      mingetty
 Requires:      mktemp
-Requires:      module-init-tools
 Requires:      mount >= 2.12
 Requires:      procps >= 1:3.2.6-1.1
 Requires:      psmisc >= 22.5-2
 Requires:      utempter
 Requires:      util-linux
+Requires:      virtual(module-tools)
 Suggests:      libcgroup
 Provides:      initscripts
 Obsoletes:     initscripts
@@ -79,9 +81,9 @@ Conflicts:    udev-core < 1:135-2
 %else
 Conflicts:     udev-core < 1:124-3
 %endif
+Conflicts:     lvm2 < 2.02.83
 Conflicts:     upstart-SysVinit < 2.86-25
 Conflicts:     wpa_supplicant < 0.6.3
-Conflicts:     lvm2 < 2.02.83
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _exec_prefix    /
@@ -117,11 +119,12 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
+%patch1 -p0
 
-# hack, currently this results -lgcc_s not found error:
+# 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 %{_prefix}/%{_lib}/librt.a"#' configure.ac
+sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt"#' configure.ac
 
 %build
 %{__aclocal}
@@ -135,8 +138,9 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a %{_prefix
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/{run/netreport,log}
-install -d $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles
+install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \
+       $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles \
+       $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -186,8 +190,10 @@ done
 ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
 
 # systemd
-install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/rc-scripts.conf
-install -D %{SOURCE2} $RPM_BUILD_ROOT/lib/systemd/system/rc-local.service
+install %{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
 
 %if "%{pld_release}" == "ac"
 rm -rf $RPM_BUILD_ROOT/etc/init
@@ -310,8 +316,10 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 
 %attr(755,root,root) /lib/firmware/firmware-loader.sh
 
-/usr/lib/tmpfiles.d/rc-scripts.conf
-/lib/systemd/system/rc-local.service
+%{systemdtmpfilesdir}/rc-scripts.conf
+%{systemdunitdir}/local.service
+%{systemdunitdir}/rc-local.service
+%{systemdunitdir}/sys-chroots.service
 
 %dir /lib/rc-scripts
 %attr(755,root,root) /lib/rc-scripts/ifdown-br