[packages/pinfo] - updated to 0.6.13 - updated amfix,pl.po-update patches - removed outdated ncurses patch - added ge
qboosh
qboosh at pld-linux.org
Sat Oct 2 08:40:56 CEST 2021
commit 5833e10bc6880dc2469c02c764be1939135817b7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Oct 2 08:45:42 2021 +0200
- updated to 0.6.13
- updated amfix,pl.po-update patches
- removed outdated ncurses patch
- added gettext patch (adjust for gettext 0.21+)
pinfo-amfix.patch | 24 ++----
pinfo-gettext.patch | 13 +++
pinfo-ncurses.patch | 26 ------
pinfo-pl.po-update.patch | 213 ++++++++++++++++-------------------------------
pinfo.spec | 17 ++--
5 files changed, 98 insertions(+), 195 deletions(-)
---
diff --git a/pinfo.spec b/pinfo.spec
index a436f41..2b8b466 100644
--- a/pinfo.spec
+++ b/pinfo.spec
@@ -5,20 +5,20 @@ Summary(pt_BR.UTF-8): Visualizador de páginas info e man
Summary(ru.UTF-8): Программа просмотра info- и man-документов в стиле lynx
Summary(uk.UTF-8): Програма перегляду info- та man-документів у стилі lynx
Name: pinfo
-Version: 0.6.10
-Release: 2
+Version: 0.6.13
+Release: 1
License: GPL v2
Group: Applications/System
#Source0Download: https://github.com/baszoetekouw/pinfo/releases
-Source0: https://github.com/baszoetekouw/pinfo/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: de82923e08cac4940d8c91770cc1ff63
+Source0: https://github.com/baszoetekouw/pinfo/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: b2671c8f6ef0aa5d7c6460c3111e2f50
Source1: %{name}.sh
Source2: %{name}.csh
Patch0: %{name}-amfix.patch
Patch1: %{name}-home_etc.patch
Patch2: %{name}-pl.po-update.patch
Patch3: %{name}-info.patch
-Patch4: %{name}-ncurses.patch
+Patch4: %{name}-gettext.patch
Patch5: %{name}-color.patch
URL: https://github.com/baszoetekouw/pinfo
BuildRequires: autoconf >= 2.57
@@ -71,6 +71,7 @@ CPPFLAGS="-I%{_includedir}/ncursesw"
%{__libtoolize}
%{__aclocal} -I macros
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure
@@ -83,8 +84,8 @@ install -d $RPM_BUILD_ROOT/etc/shrc.d
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/shrc.d/%{name}.sh
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/%{name}.csh
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/shrc.d/%{name}.sh
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/%{name}.csh
%find_lang %{name}
@@ -99,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc ChangeLog NEWS AUTHORS README
+%doc AUTHORS NEWS README.md
%attr(755,root,root) %{_bindir}/pinfo
%config(noreplace) %verify(not md5 mtime size) /etc/shrc.d/pinfo.*
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pinforc
diff --git a/pinfo-amfix.patch b/pinfo-amfix.patch
index 581ae38..0f16276 100644
--- a/pinfo-amfix.patch
+++ b/pinfo-amfix.patch
@@ -1,26 +1,14 @@
---- pinfo-0.6.3/src/Makefile.am.orig Sat Oct 20 14:56:33 2001
-+++ pinfo-0.6.3/src/Makefile.am Sat Oct 20 14:58:10 2001
-@@ -67,11 +67,6 @@
- pinfo_LDADD = $(pinfo_READLINE_OBJ) $(pinfo_SNPRINTF_OBJ)\
- $(pinfo_SIGBLOCK_OBJ) @READLINE_LIBS@ $(INTLLIBS)
+--- pinfo-0.6.13/src/Makefile.am.orig 2021-10-01 21:09:56.178358747 +0200
++++ pinfo-0.6.13/src/Makefile.am 2021-10-01 21:10:29.424845302 +0200
+@@ -68,11 +68,6 @@ pinfo_CFLAGS = $(CURSES_CFLAGS) $(WCHAR_
+ $(READLINE_INCLUDES) $(WFLAGS) \
+ -DLOCALEDIR=\"$(LOCALEDIR)\" -DCONFIGDIR=\"$(sysconfdir)/pinforc\"
-pinfo_DEPENDENCIES = $(pinfo_READLINE_OBJ)\
- $(pinfo_SNPRINTF_OBJ)\
- $(pinfo_SIGBLOCK_OBJ)\
-- $(INTLDEPS)
+- $(INTLDEPS)
-
if HAS_READLINE
else
-diff -urN pinfo-0.6.9.org/configure.ac pinfo-0.6.9/configure.ac
---- pinfo-0.6.9.org/configure.ac 2006-03-16 17:27:08.000000000 +0100
-+++ pinfo-0.6.9/configure.ac 2009-11-10 08:52:01.572442899 +0100
-@@ -222,7 +222,7 @@
- ## TODO: have this put in config.h instead of passing it on the command line
- CPPFLAGS="$CPPFLAGS -DCONFIGDIR=\\\"${sysconfdir}/pinforc\\\" -DLOCALEDIR=\\\"${LOCALEDIR}\\\""
- ## TODO: looks evil
--MANDIR="`eval MANDIR=$mandir;echo $MANDIR|sed -e \"s#NONE#$ac_default_prefix#\"`"
-+MANDIR=`eval MANDIR=$mandir;echo $MANDIR|sed -e "s#NONE#$ac_default_prefix#"`
-
-
-
diff --git a/pinfo-gettext.patch b/pinfo-gettext.patch
new file mode 100644
index 0000000..969d106
--- /dev/null
+++ b/pinfo-gettext.patch
@@ -0,0 +1,13 @@
+--- pinfo-0.6.13/configure.ac~ 2019-02-16 21:23:32.000000000 +0100
++++ pinfo-0.6.13/configure.ac 2021-10-01 22:32:49.504749260 +0200
+@@ -155,8 +155,8 @@ fi
+ # the languages for which we have .po files
+ ALL_LINGUAS="cs de eu ja nl pl pt_BR ro ru sv vi"
+
+-# Checks for all prerequisites of the intl subdirectory
+-AM_INTL_SUBDIR
++AC_CHECK_HEADERS([locale.h])
++AC_CHECK_FUNCS([setlocale])
+
+ # gettext
+ AM_GNU_GETTEXT_VERSION([0.14.4])
diff --git a/pinfo-ncurses.patch b/pinfo-ncurses.patch
deleted file mode 100644
index 71ccd1a..0000000
--- a/pinfo-ncurses.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- pinfo-0.6.9/macros/curses.m4~ 2006-03-09 20:44:38.000000000 +0100
-+++ pinfo-0.6.9/macros/curses.m4 2007-02-28 00:11:39.000000000 +0100
-@@ -254,11 +254,11 @@
- dnl
- AC_DEFUN([AC_CHECK_CURSES_COMPILE], [
-
-- dnl save CFLAGS and LDFLAGS and set new ones
-+ dnl save CFLAGS and LIBS and set new ones
- CFLAGS_OLD=$CFLAGS
- CFLAGS="$CFLAGS $curses_includes"
-- LDFLAGS_OLD=$LDFLAGS
-- LDFLAGS="$LDFLAGS $curses_libs"
-+ LIBS_OLD=$LIBS
-+ LIBS="$LIBS $curses_libs"
-
- dnl do the compile test
- AC_MSG_CHECKING([if curses is usable])
-@@ -288,7 +288,7 @@
-
- dnl restore variables
- CFLAGS=$CFLAGS_OLD
-- LDFLAGS=$LDFLAGS_OLD
-+ LIBS=$LIBS_OLD
-
- ])
-
diff --git a/pinfo-pl.po-update.patch b/pinfo-pl.po-update.patch
index e985cfc..124ee53 100644
--- a/pinfo-pl.po-update.patch
+++ b/pinfo-pl.po-update.patch
@@ -1,182 +1,109 @@
---- pinfo-0.6.10/po/pl.po.orig 2010-09-19 15:20:39.000000000 +0200
-+++ pinfo-0.6.10/po/pl.po 2018-03-03 21:44:04.583950676 +0100
-@@ -1,15 +1,19 @@
+--- pinfo-0.6.13/po/pl.po.orig 2021-10-01 21:11:16.421257367 +0200
++++ pinfo-0.6.13/po/pl.po 2021-10-01 22:29:33.735809832 +0200
+@@ -1,15 +1,17 @@
-# pinfo polish language module
+# Polish translation for pinfo.
+#
+# Przemek Borys 1999-2005
+# Krzysztof Krzy�aniak (eloy) 2005
-+# Jakub Bogusz 2006-2018
++# Jakub Bogusz 2006-2021
#
- # strings for the header-filter of info messages
+-# strings for the header-filter of info messages
-# , fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: pinfo-0.6.8\n"
-+"Project-Id-Version: pinfo-0.6.10\n"
++"Project-Id-Version: pinfo-0.6.13\n"
"Report-Msgid-Bugs-To: pinfo-devel at lists.alioth.debian.org\n"
--"POT-Creation-Date: 2006-03-15 23:04+0100\n"
+ "POT-Creation-Date: 2019-02-06 13:30+0100\n"
-"PO-Revision-Date: 2005-09-29 21:59+0200\n"
--"Last-Translator: Krzysztof Krzy�aniak (eloy) <eloy at debian.org>\n"
+-"Last-Translator: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>\n"
-"Language-Team:\n"
-+"POT-Creation-Date: 2018-03-03 21:42+0100\n"
-+"PO-Revision-Date: 2018-02-03 21:44+0100\n"
++"PO-Revision-Date: 2021-10-01 21:59+0200\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"
+ "Language: pl\n"
"MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-2\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -29,68 +33,67 @@
- msgid "Searching for tag table done\n"
- msgstr "Zako�czono poszukiwanie tablicy tag�w\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+@@ -33,21 +35,20 @@ msgstr "Zakończono poszukiwanie tablicy
+ #: src/filehandling_functions.c:708
+ #, c-format
+ msgid "Error while reading file '%s'"
+-msgstr ""
++msgstr "Błąd podczas odczytu pliku '%s'"
+
+ #: src/filehandling_functions.c:1129
+-#, fuzzy
+ msgid "Can't open file"
+-msgstr "Nie można otworzyć pliku konfiguracyjnego!\n"
++msgstr "Nie można otworzyć pliku"
--#: src/filehandling_functions.c:1211
+ #: src/filehandling_functions.c:1130 src/pinfo.c:426
+ msgid "press a key to continue"
+ msgstr "naciśnij dowolny klawisz"
+
+ #: src/filehandling_functions.c:1248
-#, fuzzy, c-format
-+#: src/filehandling_functions.c:1212
+#, c-format
- msgid "Error: could not open info file"
--msgstr "B�ad: nie nie mo�na otworzy� pliku info"
-+msgstr "B��d: nie mo�na otworzy� pliku info"
+ msgid "Error: could not open info file part"
+-msgstr "Bład: nie nie można otworzyć pliku info"
++msgstr "Bład: nie nie można otworzyć części pliku info"
--#: src/mainfunction.c:143 src/manual.c:975
-+#: src/mainfunction.c:144 src/manual.c:975
+ #: src/mainfunction.c:168 src/manual.c:1005
msgid "Are you sure you want to print?"
- msgstr "Czy na pewno drukowa�?"
-
- #
- # Go line messages
- #
--#: src/mainfunction.c:195 src/manual.c:1020
-+#: src/mainfunction.c:196 src/manual.c:1020
- msgid "Enter line: "
- msgstr "Podaj lini�: "
-
- #
- # Shellfeed messages
- #
--#: src/mainfunction.c:236 src/manual.c:1067
-+#: src/mainfunction.c:237 src/manual.c:1067
- msgid "Enter command: "
- msgstr "Podaj komend�: "
-
--#: src/mainfunction.c:255
-+#: src/mainfunction.c:256
- msgid "Operation failed..."
- msgstr "Operacja si� nie powiod�a..."
-
- #
+@@ -75,7 +76,6 @@ msgstr "Operacja się nie powiodła..."
# Regexp search messages
#
--#: src/mainfunction.c:291 src/mainfunction.c:553 src/manual.c:1120
+ #: src/mainfunction.c:316 src/mainfunction.c:575 src/manual.c:1150
-#, fuzzy
-+#: src/mainfunction.c:292 src/mainfunction.c:554 src/manual.c:1120
msgid "Enter regular expression: "
- msgstr "Wprowad� wyra�enie regularne: "
-
--#: src/mainfunction.c:523 src/mainfunction.c:621 src/manual.c:1198
-+#: src/mainfunction.c:524 src/mainfunction.c:622 src/manual.c:1198
- msgid "Search string not found..."
- msgstr "Szukany �a�cuch nie zosta� znaleziony..."
-
--#: src/mainfunction.c:580 src/manual.c:1155
-+#: src/mainfunction.c:581 src/manual.c:1155
- msgid "Invalid regular expression;"
- msgstr "B��dne wyra�enie regularne;"
+ msgstr "Wprowadź wyrażenie regularne: "
--#: src/mainfunction.c:582 src/manual.c:1157
-+#: src/mainfunction.c:583 src/manual.c:1157
- msgid "Press any key to continue..."
- msgstr "Naci�nij dowolny klawisz..."
-
- #
- # Goto messages
- #
--#: src/mainfunction.c:650
-+#: src/mainfunction.c:651
- msgid "Enter node name: "
- msgstr "Podaj nazw� w�z�a: "
-
- # , c-format
--#: src/mainfunction.c:726
-+#: src/mainfunction.c:727
- #, c-format
- msgid "Node %s not found"
- msgstr "W�ze� %s nie istnieje"
-
- # Dialogs
--#: src/mainfunction.c:1184 src/manual.c:1548
-+#: src/mainfunction.c:1185 src/manual.c:1548
- msgid "Are you sure you want to quit?"
- msgstr "Czy na pewno chcesz zako�czy� prac�?"
-
-@@ -106,7 +109,7 @@
- #: src/manual.c:324
- #, c-format
- msgid "Error: No manual page found either.\n"
--msgstr "B�ad: Nie ma r�wnie� pasuj�cej strony podr�cznika man.\n"
-+msgstr "B��d: Nie ma r�wnie� pasuj�cej strony podr�cznika man.\n"
-
- # apropos:
- #: src/manual.c:327
-@@ -132,9 +135,9 @@
+@@ -147,9 +147,9 @@ msgstr "IGNOROWANIE"
#
# loading:
- #: src/manual.c:456
+ #: src/manual.c:486
-#, fuzzy, c-format
+#, c-format
msgid "Error: No manual page found\n"
--msgstr "B�ad: Nie znaleziono strony podr�cznika.\n"
-+msgstr "B��d: Nie znaleziono strony podr�cznika.\n"
-
- #: src/manual.c:461
- #, c-format
-@@ -153,7 +156,7 @@
- msgid "Enter manual name: "
- msgstr "Podaj tytu� podr�cznika: "
+-msgstr "Bład: Nie znaleziono strony podręcznika.\n"
++msgstr "Błąd: Nie znaleziono strony podręcznika\n"
--#: src/manual.c:1631 src/video.c:114
-+#: src/manual.c:1631 src/video.c:115
+ #: src/manual.c:491
#, c-format
- msgid "Viewing line %d/%d, %d%%"
- msgstr "Przegl�danie linii %d/%d, %d%%"
-@@ -161,7 +164,7 @@
- #
- # Viewer messages
- #
--#: src/manual.c:1633 src/video.c:116
-+#: src/manual.c:1633 src/video.c:117
+@@ -205,7 +205,7 @@ msgstr "Brak pamięci\n"
+ #: src/utils.c:214
#, c-format
- msgid "Viewing line %d/%d, 100%%"
- msgstr "Przegl�danie linii %d/%d, 100%%"
-@@ -174,7 +177,7 @@
- #
- # Messages from the config file parsing procedures:
- #
--#: src/parse_config.c:163
-+#: src/parse_config.c:165
- #, c-format
- msgid "Parse error in config file on line %d\n"
- msgstr "B��d sk�adni w linii %d pliku konfiguracyjnego\n"
-@@ -200,14 +203,19 @@
- "W nazwie pliku znajduj� si� niedozwolone znaki!\n"
- "*** %s\n"
-
--#: src/utils.c:451
-+#: src/utils.c:456
- msgid "yes"
- msgstr "tak"
+ msgid "Failed to execute command '%s': %i"
+-msgstr ""
++msgstr "Nie udało się uruchomić polecenia '%s': %i"
--#: src/utils.c:452
-+#: src/utils.c:457
- msgid "no"
+ #
+ # Message for procedure, which checks the command line filename
+@@ -229,9 +229,9 @@ msgid "no"
msgstr "nie"
-+#: src/utils.c:733
+ #: src/utils.c:861
+-#, fuzzy, c-format
+#, c-format
-+msgid "Couldn't open temporary file\n"
-+msgstr "Nie mo�na otworzy� pliku tymczasowego!\n"
-+
- #: src/video.c:61
+ msgid "Couldn't open temporary file\n"
+-msgstr "Nie można otworzyć pliku konfiguracyjnego!\n"
++msgstr "Nie można otworzyć pliku tymczasowego\n"
+
+ #: src/video.c:59
msgid "File:"
- msgstr "Plik:"
+@@ -255,7 +255,7 @@ msgstr "Góra:"
+
+ #: src/video.c:297
+ msgid "Warning: matched empty string"
+-msgstr ""
++msgstr "Uwaga: dopasowano pusty łańcuch"
+
+ #: src/pinfo.c:110 src/pinfo.c:195
+ #, c-format
+@@ -384,4 +384,4 @@ msgstr "Niebezpieczeństwo: Nie można p
+ #: src/pinfo.c:694
+ #, c-format
+ msgid "Unable to drop root privileges: %s"
+-msgstr ""
++msgstr "Nie udało się odrzucić uprawnień superużytkownika: %s"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pinfo.git/commitdiff/5833e10bc6880dc2469c02c764be1939135817b7
More information about the pld-cvs-commit
mailing list