- up to 0.4.5.5; fixes static-rules order and other things

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

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 7761da8ebd57e707dc161dbc7d3dea6826eefb9a..1a4f22f9ea545eb27f783fa547a068fcc0308e15 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,20 +8,17 @@ 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.3
-Release:       6
+Version:       0.4.5.5
+Release:       1
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: ac04b9e70d2bb1583f5ea41dd2d1894e
-Source1:       rc-scripts-systemd-tmpfiles.d.conf
-Source2:       rc-local.service
-Source3:       sys-chroots.service
-Source4:       %{name}.tmpfiles
+# Source0-md5: e6f5f1d3afcdad7e0d808ffaaa8e2aba
+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}-skip_networkmanager_users_config.patch
-Patch1:                %{name}-svn.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -68,7 +65,6 @@ Requires:     utempter
 Requires:      util-linux
 Requires:      virtual(module-tools)
 Suggests:      libcgroup
-Provides:      initscripts
 Obsoletes:     initscripts
 Obsoletes:     vserver-rc-scripts
 Conflicts:     LPRng < 3.8.0-2
@@ -82,14 +78,14 @@ 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    /
 %define                localedir       /etc/sysconfig/locale
-%define        _bindir         /bin
+%define                _bindir         /bin
 %define                _sbindir        /sbin
 
 %description
@@ -120,12 +116,10 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
 
 # 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}
@@ -140,8 +134,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/usr/lib/tmpfiles.d
+       $RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \
+       $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -191,10 +185,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/local.service
-install -D %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/sys-chroots.service
-install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+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
@@ -220,7 +214,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)
@@ -317,9 +321,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/local.service
-/lib/systemd/system/sys-chroots.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
@@ -362,7 +367,6 @@ mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 
 %attr(640,root,root) %ghost /var/log/dmesg
 %attr(750,root,root) %dir /var/run/netreport
-/usr/lib/tmpfiles.d/%{name}.conf
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/crypttab