[packages/procps] disable pidof, new soname, update files, cleanup ncurses hack

glen glen at pld-linux.org
Wed Jun 3 20:31:23 CEST 2015


commit 9f722520009095fff160e865a82dca66988864af
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jun 3 21:29:13 2015 +0300

    disable pidof, new soname, update files, cleanup ncurses hack

 procps.spec | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/procps.spec b/procps.spec
index 646c6b5..e9d3ccd 100644
--- a/procps.spec
+++ b/procps.spec
@@ -129,11 +129,8 @@ Statyczna wersja biblioteki libproc.
 %patch1 -p1
 
 %{__sed} -i -e "s#usrbin_execdir=.*#usrbin_execdir='\${bindir}'#g" configure.ac
-# gettextize workaround
-%{__sed} -i -e '/po\/Makefile.in/d' configure.ac
 
 %build
-./po/update-potfiles
 %{__gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -141,8 +138,8 @@ Statyczna wersja biblioteki libproc.
 %{__autoheader}
 %{__automake}
 %configure \
-	CPPFLAGS="-I/usr/include/ncurses" \
 	--sbindir=/sbin \
+	--disable-pidof \
 	--enable-skill \
 	--enable-oom \
 	--enable-w-from
@@ -151,15 +148,14 @@ Statyczna wersja biblioteki libproc.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/%{_lib},/bin}
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
-mv $RPM_BUILD_ROOT%{_bindir}/ps $RPM_BUILD_ROOT/bin/ps
+mv $RPM_BUILD_ROOT{%{_bindir},/bin}/ps
 
 install -d $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libprocps.so.* $RPM_BUILD_ROOT/%{_lib}
+mv -f $RPM_BUILD_ROOT{%{_libdir}/libprocps.so.*,/%{_lib}}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libprocps.so.*.*.*) \
         $RPM_BUILD_ROOT%{_libdir}/libprocps.so
 
@@ -189,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS Documentation/{BUGS,FAQ,TODO} NEWS README top/README.top
 %attr(755,root,root) /%{_lib}/libprocps.so.*.*
-%ghost %attr(755,root,root) /%{_lib}/libprocps.so.0
+%ghost %attr(755,root,root) /%{_lib}/libprocps.so.4
 %attr(755,root,root) /bin/ps
 %attr(755,root,root) /sbin/sysctl
 %attr(755,root,root) %{_bindir}/XConsole
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/procps.git/commitdiff/2a2e3e9d6c6ed2b3ae075cae2d99101a9a9361b2



More information about the pld-cvs-commit mailing list