X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=blobdiff_plain;f=rc-scripts.spec;h=89ca1d943896deb44b6382e99bfcf4c8fe468013;hp=e346f096a8acef7f1457a1642218b28a9d68b36d;hb=0d5464140e41f7007628bedc3b345c037949d74e;hpb=0e568726115b0c448f5eae8c84c0290c4c3252a0

diff --git a/rc-scripts.spec b/rc-scripts.spec
index e346f09..89ca1d9 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -7,20 +7,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:	9
+Version:	0.4.6
+Release:	2
 License:	GPL v2
 Group:		Base
-#Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	ac04b9e70d2bb1583f5ea41dd2d1894e
+# Source0-md5:	4340461fd2bdfd04b71ec926ca3bad71
 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
 Patch100:	%{name}-tld.patch
+URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
@@ -41,11 +38,11 @@ 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:	virtual(init-daemon)
 Requires:	filesystem >= 4.0-1
 Requires:	findutils
 Requires:	fsck
@@ -63,7 +60,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
@@ -74,13 +70,14 @@ Conflicts:	psacct < 6.3.5-10
 Conflicts:	tzdata < 2007b-1.1
 Conflicts:	udev-core < 1:135-2
 Conflicts:	lvm2 < 2.02.83
+Conflicts:	pdksh < 5.2.14-58
 Conflicts:	upstart-SysVinit < 2.86-25
 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
@@ -111,13 +108,11 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
 %patch100 -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}
@@ -132,7 +127,7 @@ 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{%{systemdtmpfilesdir},%{systemdunitdir}}
 
 %{__make} install \
@@ -188,6 +183,9 @@ 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
 
+# packaged into SysVinit and systemd-init (supported options differ)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -208,7 +206,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)