SPECS (AC-branch): psmisc.spec, Firebird.spec, rc-scripts.spec - m...

[arvenil]

Author: arvenil                      Date: Thu May 17 20:59:19 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH)

---- Files affected:
SPECS:
   psmisc.spec (1.86.2.1 -> 1.86.2.2) , Firebird.spec (1.28 -> 1.28.2.1) , rc-scripts.spec (1.246.2.6 -> 1.246.2.7) 

---- Diffs:

================================================================
Index: SPECS/psmisc.spec
diff -u SPECS/psmisc.spec:1.86.2.1 SPECS/psmisc.spec:1.86.2.2
--- SPECS/psmisc.spec:1.86.2.1	Thu May 17 22:52:50 2007
+++ SPECS/psmisc.spec	Thu May 17 22:59:11 2007
@@ -15,7 +15,7 @@
 Summary(uk):	őÔÉĚŚÔÉ ŇĎÂĎÔÉ Ú ĐŇĎĂĹÓÁÍÉ
 Name:		psmisc
 Version:	22.3
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/psmisc/%{name}-%{version}.tar.gz
@@ -28,10 +28,10 @@
 BuildRequires:	gettext-devel >= 0.14.1
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	ncurses-devel >= 5.0
+Conflicts:	rc-scripts < 0.4.1.6-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
-%define		_sbindir	/sbin
 
 %description
 The psmisc package contains utilities for managing processes on your
@@ -104,9 +104,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mkdir $RPM_BUILD_ROOT%{_sbindir}
-mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
-
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -f $RPM_BUILD_ROOT%{_mandir}/README.psmisc-non-english-man-pages
 
@@ -118,7 +115,6 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS Chang* NEWS README
-%attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 %lang(fi) %{_mandir}/fi/man1/*
@@ -136,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86.2.2  2007/05/17 20:59:11  arvenil
+- mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH)
+
 Revision 1.86.2.1  2007/05/17 20:52:50  arvenil
 - fixed autotools order (merged from HEAD)
 

================================================================
Index: SPECS/Firebird.spec
diff -u SPECS/Firebird.spec:1.28 SPECS/Firebird.spec:1.28.2.1
--- SPECS/Firebird.spec:1.28	Thu May 19 18:16:17 2005
+++ SPECS/Firebird.spec	Thu May 17 22:59:11 2007
@@ -35,6 +35,7 @@
 BuildRequires:	libtool
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
+BuildRequires:	psmisc >= 22.3-2
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	unzip
 Requires:	%{name}-lib = %{version}-%{release}
@@ -164,7 +165,7 @@
 	LIB_CLIENT_LINK_OPTIONS="-lpthread"
 
 # fb_lock_mgr is started during build - try to stop it (if /proc is mounted...)
-/sbin/fuser -k gen/firebird/bin/fb_lock_mgr 2>/dev/null || :
+fuser -k gen/firebird/bin/fb_lock_mgr 2>/dev/null || :
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -283,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28.2.1  2007/05/17 20:59:11  arvenil
+- mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH)
+
 Revision 1.28  2005/05/19 16:16:17  qboosh
 - changed libgds.so.0 symlink to more update-resistant
 

================================================================
Index: SPECS/rc-scripts.spec
diff -u SPECS/rc-scripts.spec:1.246.2.6 SPECS/rc-scripts.spec:1.246.2.7
--- SPECS/rc-scripts.spec:1.246.2.6	Wed May  9 19:19:04 2007
+++ SPECS/rc-scripts.spec	Thu May 17 22:59:11 2007
@@ -11,7 +11,7 @@
 Summary(tr):	inittab ve /etc/rc.d dosyalarý
 Name:		rc-scripts
 Version:	0.4.1.6
-Release:	1
+Release:	2
 License:	GPL
 Group:		Base
 #Source0:	ftp://ftp1.pld-linux.org/people/arekm/software/%{name}-%{version}.tar.gz
@@ -19,6 +19,7 @@
 # Source0-md5:	1d6819878e14787491d99dd5bdc847b8
 Patch0:		%{name}-dev_alias.patch
 Patch1:		%{name}-sleep.patch
+Patch2:		%{name}-fuser.patch
 URL:		http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -51,7 +52,7 @@
 Requires:	mount >= 2.12
 Requires:	net-tools
 Requires:	procps >= 1:3.2.6-1.1
-Requires:	psmisc
+Requires:	psmisc >= 22.3-2
 Requires:	utempter
 Requires:	util-linux
 Provides:	initscripts
@@ -98,6 +99,7 @@
 %setup -q
 %{?with_devalias:%patch0 -p0}
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -333,6 +335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.246.2.7  2007/05/17 20:59:11  arvenil
+- mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH)
+
 Revision 1.246.2.6  2007/05/09 17:19:04  glen
 - 0.4.1.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/psmisc.spec?r1=1.86.2.1&r2=1.86.2.2&f=u
    http://cvs.pld-linux.org/SPECS/Firebird.spec?r1=1.28&r2=1.28.2.1&f=u
    http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.246.2.6&r2=1.246.2.7&f=u