[packages/procps] - up to 3.3.3
arekm
arekm at pld-linux.org
Fri Nov 9 18:17:09 CET 2012
commit 0913e117c270699d9225572536f815a3a52b9f2d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Nov 9 18:17:06 2012 +0100
- up to 3.3.3
procps-selinux.patch | 66 ----------------------------------------------------
procps.spec | 59 ++++++++++++++++++++++------------------------
2 files changed, 28 insertions(+), 97 deletions(-)
---
diff --git a/procps.spec b/procps.spec
index 17edfec..75e8823 100644
--- a/procps.spec
+++ b/procps.spec
@@ -1,5 +1,3 @@
-%define snap 20111124
-%define rel 1
Summary: Utilities for monitoring your system and processes on your system
Summary(de.UTF-8): Utilities zum Ueberwachen Ihres Systems und der Prozesse
Summary(es.UTF-8): Utilitarios de monitoración de procesos
@@ -8,22 +6,20 @@ Summary(pl.UTF-8): Narzędzia do monitorowania procesów
Summary(pt_BR.UTF-8): Utilitários de monitoração de processos
Summary(tr.UTF-8): Süreç izleme araçları
Name: procps
-Version: 3.2.8
-Release: 1.%{snap}.%{rel}
+Version: 3.3.3
+Release: 1
Epoch: 1
License: GPL
Group: Applications/System
-Source0: http://gitorious.org/procps/procps/archive-tarball/master#/%{name}-%{snap}.tar.gz
-# Source0-md5: 01acfb2f9a2d832c95d9abbedbdbe3ce
-Source1: http://atos.wmid.amu.edu.pl/~undefine/%{name}-non-english-man-pages.tar.bz2
+Source0: http://gitorious.org/procps/procps/archive-tarball/v%{version}#/%{name}-%{version}.tar.gz
+# Source0-md5: b3a24b00791bc97b62f6952264d7031d
+Source1: %{name}-non-english-man-pages.tar.bz2
# Source1-md5: 60d24720b76c10553ed4abf68b76e079
Source2: top.desktop
Source3: top.png
Source4: XConsole.sh
-Patch2: %{name}-FILLBUG_backport.patch
-# http://www.nsa.gov/selinux/patches/procps-selinux.patch.gz
-Patch3: %{name}-selinux.patch
-URL: http://gitorious.org/procps/
+Patch1: %{name}-FILLBUG_backport.patch
+URL: http://gitorious.org/procps/pages/Home
BuildRequires: ncurses-devel >= 5.1
BuildRequires: rpmbuild(macros) >= 1.402
Requires(post): /sbin/ldconfig
@@ -120,21 +116,25 @@ Statyczna wersja biblioteki libproc.
%prep
%setup -q -n %{name}-%{name}
-
-%patch2 -p1
-%patch3 -p1
+%patch1 -p1
sed -i -e "s#usrbin_execdir=.*#usrbin_execdir='\${bindir}'#g" configure.ac
+echo AM_MKINSTALLDIRS >> configure.ac
%build
+./po/update-potfiles
+%{__autopoint}
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
CPPFLAGS="-I%{_includedir}/ncurses" \
- --sbindir=/sbin
+ --sbindir=/sbin \
+ --enable-skill \
+ --enable-oom \
+ --enable-w-from
%{__make}
%install
@@ -146,11 +146,11 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/%{_lib},/bin}
pkgconfigdir=%{_pkgconfigdir}
mv $RPM_BUILD_ROOT%{_bindir}/ps $RPM_BUILD_ROOT/bin/ps
-mv $RPM_BUILD_ROOT%{_libdir}/libproc-ng-*.so $RPM_BUILD_ROOT/%{_lib}
-ln -snf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libproc-ng-*.so) \
- $RPM_BUILD_ROOT%{_libdir}/libproc-ng.so
-ln -snf libproc-ng.so $RPM_BUILD_ROOT%{_libdir}/libproc.so
-ln -snf libproc-ng.a $RPM_BUILD_ROOT%{_libdir}/libproc.a
+
+install -d $RPM_BUILD_ROOT/%{_lib}
+mv -f $RPM_BUILD_ROOT%{_libdir}/libprocps.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libprocps.so.*.*.*) \
+ $RPM_BUILD_ROOT%{_libdir}/libprocps.so
install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -159,10 +159,8 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/XConsole
# PLD: kill is packaged in util-linux
%{__rm} $RPM_BUILD_ROOT%{_bindir}/kill
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/kill.1
-# PLD: packaged in rc-scripts
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.conf
# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libproc-ng.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libprocps.la
# packaged as doc
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/procps-ng
@@ -178,8 +176,9 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS BUGS FAQ NEWS README README.top TODO
-%attr(755,root,root) /%{_lib}/libproc-ng-3.3.0.so
+%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
%attr(755,root,root) /bin/ps
%attr(755,root,root) /sbin/sysctl
%attr(755,root,root) %{_bindir}/XConsole
@@ -230,12 +229,10 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libproc.so
-%attr(755,root,root) %{_libdir}/libproc-ng.so
+%attr(755,root,root) %{_libdir}/libprocps.so
%{_includedir}/proc
-%{_pkgconfigdir}/libproc-ng.pc
+%{_pkgconfigdir}/libprocps.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/libproc.a
-%{_libdir}/libproc-ng.a
+%{_libdir}/libprocps.a
diff --git a/procps-selinux.patch b/procps-selinux.patch
deleted file mode 100644
index 1922e45..0000000
--- a/procps-selinux.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- procps-3.2.5/ps/parser.c.orig 2005-01-14 20:10:21.000000000 +0100
-+++ procps-3.2.5/ps/parser.c 2005-02-06 03:29:19.477738552 +0100
-@@ -336,12 +336,19 @@
- exclusive("-V");
- display_version();
- exit(0);
-+#ifdef __linux__
-+ case 'Z': /* full Mandatory Access Control level info */
-+ trace("-Z shows full MAC info\n");
-+ format_modifiers |= FF_Fc;
-+ break;
-+#else
- // This must be verified against SVR4-MP. (UnixWare or Powermax)
- // Leave it undocumented until that problem is solved.
- case 'Z': /* full Mandatory Access Control level info */
- trace("-Z shows full MAC info\n");
- format_modifiers |= FM_M;
- break;
-+#endif
- case 'a':
- trace("-a select all with a tty, but omit session leaders.\n");
- simple_select |= SS_U_a;
-@@ -472,12 +479,12 @@
- trace("-y Print lnone info in UID/USER column or do Sun -l hack.\n");
- format_modifiers |= FM_y;
- break;
--#if 0
- // This must be verified against SVR4-MP (UnixWare or Powermax)
- case 'z': /* alias of Mandatory Access Control level info */
- trace("-z shows aliased MAC info\n");
- format_modifiers |= FM_M;
- break;
-+#if 0
- // Solaris 10 does this
- case 'z': /* select by zone */
- trace("-z secects by zone\n");
-@@ -605,10 +612,17 @@
- trace("X Old Linux i386 register format\n");
- format_flags |= FF_LX;
- break;
-+#ifdef __linux__
-+ case 'Z':
-+ trace("Z SElinux Security Context format\n");
-+ format_flags |= FF_Fc;
-+ break;
-+#else
- case 'Z': /* FreeBSD does MAC like SGI's Irix does it */
- trace("Z Print security label for Mandatory Access Control.\n");
- format_modifiers |= FM_M;
- break;
-+#endif
- case 'a':
- trace("a Select all w/tty, including other users\n");
- simple_select |= SS_B_a;
---- procps-3.2.5/ps/ps.1.orig 2004-12-02 18:39:04.000000000 +0100
-+++ procps-3.2.5/ps/ps.1 2005-02-06 03:30:51.666723696 +0100
-@@ -446,6 +446,9 @@
- Do not show flags; show rss in place of addr.
- This option can only be used with \fB\-l\fR.
-
-+.opt \-Z
-+display security context format (NSA SELinux, etc.)
-+
- .opt \-\-format \ format
- user\-defined format. Identical to \fB\-o\fR and \fBo\fR.
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/procps.git/commitdiff/0913e117c270699d9225572536f815a3a52b9f2d
More information about the pld-cvs-commit
mailing list