Accepting request 204437 from home:posophe:branches:Base:System

Some improvements

OBS-URL: https://build.opensuse.org/request/show/204437
OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=68
This commit is contained in:
Marcus Meissner 2013-10-24 09:32:22 +00:00 committed by Git OBS Bridge
parent f0dfbd7a21
commit 51c88903af
2 changed files with 15 additions and 21 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Oct 23 14:35:46 UTC 2013 - p.drouand@gmail.com
- Remove %fillup_prereq %insserv_prereq PreReq; package provides
neither sysconfigfile or sysvinit script
- Use %lang_package instead of define a lang subpackage manually
- Use %configure instead of ./configure
- Don't define CC and CXX flags manually
- Remove redundant %clean section
-------------------------------------------------------------------
Wed Oct 9 12:33:26 UTC 2013 - schwab@suse.de

View File

@ -23,13 +23,10 @@ BuildRequires: glibc-devel
BuildRequires: libselinux-devel
BuildRequires: ncurses-devel
Url: http://sourceforge.net/projects/psmisc/
PreReq: %fillup_prereq %insserv_prereq
Version: 22.20
Release: 0
Provides: ps:/usr/bin/killall
%if %suse_version > 1020
Recommends: %{name}-lang = 6.18.00
%endif
Recommends: %{name}-lang
Summary: Utilities for managing processes on your system
License: GPL-2.0+
Group: System/Monitoring
@ -41,7 +38,6 @@ Patch3: %name-22.20-pstree.patch
Patch4: peekfd-m68k.patch
Patch42: %{name}-%{version}-upstream.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define nopeek s390 s390x ia64 %sparc hppa aarch64
%description
@ -52,13 +48,7 @@ command sends a specified signal (SIGTERM if nothing is specified) to
processes identified by name. The fuser command identifies the PIDs of
processes that are using specified files or filesystems.
%package lang
Summary: Languages for package %{name}
Group: System/Localization
Requires: %{name} = %{version}
%description lang
Provides translations to the package %{name}
%lang_package
%prep
%setup -q
@ -73,11 +63,8 @@ Provides translations to the package %{name}
autoreconf -fi
CFLAGS="-D_GNU_SOURCE ${RPM_OPT_FLAGS} -pipe"
CXXFLAGS="$CFLAGS"
CC=gcc
CXX=g++
export CFLAGS CXXFLAGS CC CXX
sh ./configure --prefix=%{_prefix} --mandir=%{_mandir} \
--disable-rpath \
export CFLAGS CXXFLAGS
%configure --disable-rpath \
--with-gnu-ld \
--enable-selinux \
--enable-mountinfo-list \
@ -93,9 +80,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/peekfd.1*
%endif
%find_lang psmisc
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr (-,root,root,755)
/bin/fuser
@ -114,6 +98,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/prtstat.1*
%{_mandir}/man1/pstree.1*
%files lang -f psmisc.lang
%files lang -f %{name}.lang
%changelog