[packages/psmisc] - patch cleanup, updated required glibc version

qboosh qboosh at pld-linux.org
Wed Nov 21 18:44:17 CET 2018


commit 60026bceede6b2e4e0ced6964e318650d5e814bc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Nov 21 18:48:29 2018 +0100

    - patch cleanup, updated required glibc version

 psmisc-pl.po-update.patch | 74 -----------------------------------------------
 psmisc.spec               |  4 +--
 2 files changed, 2 insertions(+), 76 deletions(-)
---
diff --git a/psmisc.spec b/psmisc.spec
index 7fa2abd..d5ec9e2 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -21,11 +21,12 @@ Source0:	http://downloads.sourceforge.net/psmisc/%{name}-%{version}.tar.xz
 # Source0-md5:	0524258861f00be1a02d27d39d8e5e62
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	9add7665e440bbd6b0b4f9293ba8b86d
-Patch0:		%{name}-pl.po-update.patch
 URL:		http://psmisc.sourceforge.net/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake >= 1:1.10
 BuildRequires:	gettext-tools >= 0.16.1
+# for %ms scanf format
+BuildRequires:	glibc-devel >= 6:2.7
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	ncurses-devel >= 5.0
 Conflicts:	heartbeat < 2.0.8-0.2
@@ -87,7 +88,6 @@ відкрив файл.
 
 %prep
 %setup -q
-#%patch0 -p1
 
 %build
 install -d misc; echo -n '#!/bin/sh\necho -n %{version}' > misc/git-version-gen; chmod +x misc/git-version-gen
diff --git a/psmisc-pl.po-update.patch b/psmisc-pl.po-update.patch
deleted file mode 100644
index c97f41a..0000000
--- a/psmisc-pl.po-update.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- psmisc-22.16/po/pl.po.orig	2012-02-25 23:03:54.000000000 +0100
-+++ psmisc-22.16/po/pl.po	2012-02-27 18:20:22.589479517 +0100
-@@ -1,14 +1,14 @@
- # Polish translations for psmisc.
- # Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
- # This file is distributed under the same license as the psmisc package.
--# Jakub Bogusz <qboosh at pld-linux.org>, 2003-2010.
-+# Jakub Bogusz <qboosh at pld-linux.org>, 2003-2012.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: psmisc 22.11-pre1\n"
-+"Project-Id-Version: psmisc 22.16\n"
- "Report-Msgid-Bugs-To: csmall at small.dropbear.id.au\n"
- "POT-Creation-Date: 2012-02-26 09:03+1100\n"
--"PO-Revision-Date: 2010-03-28 19:24+0200\n"
-+"PO-Revision-Date: 2012-02-27 18:15+0100\n"
- "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
- "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
- "Language: pl\n"
-@@ -17,7 +17,7 @@
- "Content-Transfer-Encoding: 8bit\n"
- 
- #: src/fuser.c:128
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: fuser [-fMuv] [-a|-s] [-4|-6] [-c|-m|-n SPACE] [-k [-i] [-SIGNAL]] "
- "NAME...\n"
-@@ -61,6 +61,7 @@
- "  -SYGNA�               wys�anie podanego sygna�u zamiast SIGKILL\n"
- "  -u,--user             wy�wietlenie identyfikator�w u�ytkownik�w\n"
- "  -v,--verbose          podanie wi�kszej ilo�ci informacji\n"
-+"  -w,--writeonly        zabicie tylko proces�w z prawem zapisu\n"
- "  -V,--version          wy�wietlenie informacji o wersji\n"
- 
- #: src/fuser.c:146
-@@ -361,9 +362,9 @@
- msgstr "Maksymalna liczba nazw to %d\n"
- 
- #: src/killall.c:876
--#, fuzzy, c-format
-+#, c-format
- msgid "%s lacks process entries (not mounted ?)\n"
--msgstr "%s jest pusty (nie podmontowany?)\n"
-+msgstr "%s nie zawiera wpis�w proces�w (nie jest zamontowany?)\n"
- 
- #: src/peekfd.c:96
- #, c-format
-@@ -570,10 +571,10 @@
- #: src/pstree.c:755
- #, c-format
- msgid "%s is empty (not mounted ?)\n"
--msgstr "%s jest pusty (nie podmontowany?)\n"
-+msgstr "%s jest pusty (nie jest zamontowany?)\n"
- 
- #: src/pstree.c:793
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Usage: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
- "              [ -A | -G | -U ] [ PID | USER ]\n"
-@@ -609,8 +610,9 @@
- "  -G, --vt100         u�ycie znak�w ramek VT100\n"
- "  -l, --long          nie obcinanie d�ugich linii\n"
- "  -n, --numeric-sort  sortowanie wyj�cia wg PID-u\n"
--"  -p, --show-pids     wy�wietlanie PID-�w; w��cza tak�e -c\n"
--"  -u, --uid-changes   wy�wietlanie zmian uid�w\n"
-+"  -p, --show-pids     wy�wietlenie PID-�w; w��cza tak�e -c\n"
-+"  -s, --show-parents  wy�wietlenie rodzic�w wybranego procesu\n"
-+"  -u, --uid-changes   wy�wietlenie zmian uid�w\n"
- "  -U, --unicode       u�ycie znak�w ramek UTF-8 (Unicode)\n"
- "  -V, --version       wy�wietlenie informacji o wersji\n"
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/psmisc.git/commitdiff/60026bceede6b2e4e0ced6964e318650d5e814bc



More information about the pld-cvs-commit mailing list