From 3e6433897a85466e8868cf6b0e129e243a127646 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 3 Mar 2018 21:53:33 +0100 Subject: [PATCH] - new URLs, updated to 0.6.10 - updated pl.po-update,home_etc patches --- pinfo-home_etc.patch | 28 -------- pinfo-pl.po-update.patch | 143 +++++++++++++++++++++++++++++++++------ pinfo.spec | 23 +++---- 3 files changed, 134 insertions(+), 60 deletions(-) diff --git a/pinfo-home_etc.patch b/pinfo-home_etc.patch index d6638ff..6af6085 100644 --- a/pinfo-home_etc.patch +++ b/pinfo-home_etc.patch @@ -1,16 +1,3 @@ -diff -ur pinfo-0.6.9.org/doc/pinfo.1 pinfo-0.6.9/doc/pinfo.1 ---- pinfo-0.6.9.org/doc/pinfo.1 2006-03-16 17:27:56.000000000 +0100 -+++ pinfo-0.6.9/doc/pinfo.1 2006-03-18 19:21:54.315546250 +0100 -@@ -133,7 +133,7 @@ - - .SH COLOR AND KEY DEFINITIONS - .P --There are configuration files called ~/.pinforc and -+There are configuration files called $HOME_ETC/.pinforc or ~/.pinforc and - [prefix]/etc/pinforc, for local and global configuration (where prefix is the - prefix of the directory, where pinfo is installed, i.e. /usr/local, or /). - Here's an example of such a file; we'll discuss the contents below: -diff -ur pinfo-0.6.9.org/doc/pinfo.1.in pinfo-0.6.9/doc/pinfo.1.in --- pinfo-0.6.9.org/doc/pinfo.1.in 2006-03-09 21:54:33.000000000 +0100 +++ pinfo-0.6.9/doc/pinfo.1.in 2006-03-18 19:21:54.319546500 +0100 @@ -133,7 +133,7 @@ @@ -22,21 +9,6 @@ diff -ur pinfo-0.6.9.org/doc/pinfo.1.in pinfo-0.6.9/doc/pinfo.1.in [prefix]/etc/pinforc, for local and global configuration (where prefix is the prefix of the directory, where pinfo is installed, i.e. /usr/local, or /). Here's an example of such a file; we'll discuss the contents below: -diff -ur pinfo-0.6.9.org/doc/pinfo.info pinfo-0.6.9/doc/pinfo.info ---- pinfo-0.6.9.org/doc/pinfo.info 2006-03-16 17:28:00.000000000 +0100 -+++ pinfo-0.6.9/doc/pinfo.info 2006-03-18 19:21:54.319546500 +0100 -@@ -174,8 +174,8 @@ - file::, and at the key descriptions, *Note Keys::. Keys available in - manual viewer differ a bit from the keys available in info viewer. - -- There are configuration files called `~/.pinforc' and --`[prefix]/etc/pinforc', for local and global configuration (where -+ There are configuration files called `$HOME_ETC/.pinforc' or `~/.pinforc' -+and `[prefix]/etc/pinforc', for local and global configuration (where - prefix is the prefix of the directory, where `pinfo' is installed, i.e. - `/usr/local', or `/usr'). - -diff -ur pinfo-0.6.9.org/doc/pinfo.texi pinfo-0.6.9/doc/pinfo.texi --- pinfo-0.6.9.org/doc/pinfo.texi 2006-03-16 16:40:41.000000000 +0100 +++ pinfo-0.6.9/doc/pinfo.texi 2006-03-18 19:21:54.319546500 +0100 @@ -202,8 +202,8 @@ diff --git a/pinfo-pl.po-update.patch b/pinfo-pl.po-update.patch index f2cc846..e985cfc 100644 --- a/pinfo-pl.po-update.patch +++ b/pinfo-pl.po-update.patch @@ -1,50 +1,116 @@ ---- pinfo-0.6.9/po/pl.po.orig 2006-03-16 17:28:00.000000000 +0100 -+++ pinfo-0.6.9/po/pl.po 2006-03-19 20:08:29.910624250 +0100 -@@ -1,15 +1,17 @@ +--- 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 polish language module +# Polish translation for pinfo. +# +# Przemek Borys 1999-2005 +# Krzysztof Krzy¿aniak (eloy) 2005 ++# Jakub Bogusz 2006-2018 # # 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.9\n" ++"Project-Id-Version: pinfo-0.6.10\n" "Report-Msgid-Bugs-To: pinfo-devel@lists.alioth.debian.org\n" - "POT-Creation-Date: 2006-03-16 17:28+0100\n" +-"POT-Creation-Date: 2006-03-15 23:04+0100\n" -"PO-Revision-Date: 2005-09-29 21:59+0200\n" -"Last-Translator: Krzysztof Krzy¿aniak (eloy) \n" -"Language-Team:\n" -+"PO-Revision-Date: 2006-03-19 20:01+0100\n" ++"POT-Creation-Date: 2018-03-03 21:42+0100\n" ++"PO-Revision-Date: 2018-02-03 21:44+0100\n" +"Last-Translator: Jakub Bogusz \n" +"Language-Team: Polish \n" ++"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -@@ -30,9 +32,9 @@ +@@ -29,68 +33,67 @@ + msgid "Searching for tag table done\n" msgstr "Zakoñczono poszukiwanie tablicy tagów\n" - #: src/filehandling_functions.c:1212 +-#: src/filehandling_functions.c:1211 -#, 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" - #: src/mainfunction.c:144 src/manual.c:975 +-#: src/mainfunction.c:143 src/manual.c:975 ++#: src/mainfunction.c:144 src/manual.c:975 msgid "Are you sure you want to print?" -@@ -60,7 +62,6 @@ + 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..." + + # # Regexp search messages # - #: src/mainfunction.c:292 src/mainfunction.c:554 src/manual.c:1120 +-#: src/mainfunction.c:291 src/mainfunction.c:553 src/manual.c:1120 -#, fuzzy ++#: src/mainfunction.c:292 src/mainfunction.c:554 src/manual.c:1120 msgid "Enter regular expression: " msgstr "Wprowad¼ wyra¿enie regularne: " -@@ -106,7 +107,7 @@ +-#: 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;" + +-#: 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" @@ -53,7 +119,7 @@ # apropos: #: src/manual.c:327 -@@ -132,9 +133,9 @@ +@@ -132,9 +135,9 @@ # # loading: #: src/manual.c:456 @@ -65,15 +131,52 @@ #: src/manual.c:461 #, c-format -@@ -209,9 +210,9 @@ +@@ -153,7 +156,7 @@ + msgid "Enter manual name: " + msgstr "Podaj tytu³ podrêcznika: " + +-#: src/manual.c:1631 src/video.c:114 ++#: src/manual.c:1631 src/video.c:115 + #, 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 + #, 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" + +-#: src/utils.c:452 ++#: src/utils.c:457 + msgid "no" msgstr "nie" - #: src/utils.c:720 --#, fuzzy, c-format ++#: src/utils.c:733 +#, c-format - msgid "Couldn't open temporary file\n" --msgstr "Nie mo¿na otworzyæ pliku konfiguracyjnego!\n" -+msgstr "Nie mo¿na otworzyæ pliku tymczasowego\n" - ++msgid "Couldn't open temporary file\n" ++msgstr "Nie mo¿na otworzyæ pliku tymczasowego!\n" ++ #: src/video.c:61 msgid "File:" + msgstr "Plik:" diff --git a/pinfo.spec b/pinfo.spec index 2adda85..53e82e7 100644 --- a/pinfo.spec +++ b/pinfo.spec @@ -5,12 +5,13 @@ 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.9 -Release: 10 +Version: 0.6.10 +Release: 1 License: GPL v2 Group: Applications/System -Source0: https://alioth.debian.org/download.php/1498/%{name}-%{version}.tar.bz2 -# Source0-md5: e0c788467945f5f97fbacad55863e5b8 +#Source0Download: https://github.com/baszoetekouw/pinfo/releases +Source0: https://github.com/baszoetekouw/pinfo/archive/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: de82923e08cac4940d8c91770cc1ff63 Source1: %{name}.sh Source2: %{name}.csh Patch0: %{name}-amfix.patch @@ -19,7 +20,7 @@ Patch2: %{name}-pl.po-update.patch Patch3: %{name}-info.patch Patch4: %{name}-ncurses.patch Patch5: %{name}-color.patch -URL: http://pinfo.alioth.debian.org/ +URL: https://github.com/baszoetekouw/pinfo BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: gettext-tools @@ -64,8 +65,6 @@ Pinfo - це програма перегляду info-файлів та man-ст %patch4 -p1 %patch5 -p1 -rm -f doc/pinfo.info po/stamp-po - %build CPPFLAGS="-I%{_includedir}/ncursesw" %{__gettextize} @@ -92,17 +91,17 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/%{name}.csh %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files -f %{name}.lang %defattr(644,root,root,755) %doc ChangeLog NEWS AUTHORS README %attr(755,root,root) %{_bindir}/pinfo -%config(noreplace) %verify(not md5 mtime size) /etc/shrc.d/* +%config(noreplace) %verify(not md5 mtime size) /etc/shrc.d/pinfo.* %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pinforc -%{_mandir}/man1/* -%{_infodir}/pinfo* +%{_mandir}/man1/pinfo.1* +%{_infodir}/pinfo.info* -- 2.43.0