Author: arvenil Date: Tue May 15 15:02:35 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH)
---- Files affected: SPECS: rc-scripts.spec (1.259 -> 1.260) , psmisc.spec (1.90 -> 1.91) , heartbeat.spec (1.72 -> 1.73) , Firebird.spec (1.50 -> 1.51) ---- Diffs: ================================================================ Index: SPECS/rc-scripts.spec diff -u SPECS/rc-scripts.spec:1.259 SPECS/rc-scripts.spec:1.260 --- SPECS/rc-scripts.spec:1.259 Tue May 1 03:18:43 2007 +++ SPECS/rc-scripts.spec Tue May 15 17:02:29 2007 @@ -11,7 +11,7 @@ Summary(tr.UTF-8): 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.5-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.260 2007/05/15 15:02:29 arvenil +- mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH) + Revision 1.259 2007/05/01 01:18:43 baggins - rel 1 ================================================================ Index: SPECS/psmisc.spec diff -u SPECS/psmisc.spec:1.90 SPECS/psmisc.spec:1.91 --- SPECS/psmisc.spec:1.90 Wed Apr 25 17:55:03 2007 +++ SPECS/psmisc.spec Tue May 15 17:02:29 2007 @@ -15,7 +15,7 @@ Summary(uk.UTF-8): Утиліти роботи з процесами Name: psmisc Version: 22.5 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source0: http://dl.sourceforge.net/psmisc/%{name}-%{version}.tar.gz @@ -29,10 +29,11 @@ BuildRequires: gettext-devel >= 0.14.1 %{?with_selinux:BuildRequires: libselinux-devel} BuildRequires: ncurses-devel >= 5.0 +Conflicts: heartbeat < 2.0.8-0.2 +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 @@ -108,9 +109,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 @@ -122,7 +120,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/* @@ -140,6 +137,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.91 2007/05/15 15:02:29 arvenil +- mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH) + Revision 1.90 2007/04/25 15:55:03 qboosh - updated to 22.5 (currently peekfd is x86-only) ================================================================ Index: SPECS/heartbeat.spec diff -u SPECS/heartbeat.spec:1.72 SPECS/heartbeat.spec:1.73 --- SPECS/heartbeat.spec:1.72 Tue Feb 13 08:47:11 2007 +++ SPECS/heartbeat.spec Tue May 15 17:02:29 2007 @@ -6,7 +6,7 @@ Summary(pt_BR.UTF-8): Implementa sistema de monitoração (heartbeats) visando Alta Disponibilidade Name: heartbeat Version: 2.0.8 -Release: 0.1 +Release: 0.2 License: GPL v2+ Group: Applications/System Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz @@ -47,6 +47,7 @@ Requires(post,postun): /sbin/ldconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel +Requires: psmisc >= 22.5-2 Requires: rc-scripts Requires: syslogdaemon Provides: group(haclient) @@ -314,6 +315,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.73 2007/05/15 15:02:29 arvenil +- mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH) + Revision 1.72 2007/02/13 07:47:11 glen - tabs in preamble ================================================================ Index: SPECS/Firebird.spec diff -u SPECS/Firebird.spec:1.50 SPECS/Firebird.spec:1.51 --- SPECS/Firebird.spec:1.50 Wed Feb 28 13:27:46 2007 +++ SPECS/Firebird.spec Tue May 15 17:02:29 2007 @@ -45,6 +45,7 @@ BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: ncurses-devel +BuildRequires: psmisc >= 22.5-2 BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: unzip Requires: %{name}-lib = %{version}-%{release} @@ -204,7 +205,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 @@ -322,6 +323,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.51 2007/05/15 15:02:29 arvenil +- mv /sbin/fuser /bin/fuser (because KDE and users want it in PATH) + Revision 1.50 2007/02/28 12:27:46 arekm - rel 2; build on 64bit, too ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rc-scripts.spec?r1=1.259&r2=1.260&f=u http://cvs.pld-linux.org/SPECS/psmisc.spec?r1=1.90&r2=1.91&f=u http://cvs.pld-linux.org/SPECS/heartbeat.spec?r1=1.72&r2=1.73&f=u http://cvs.pld-linux.org/SPECS/Firebird.spec?r1=1.50&r2=1.51&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
