diff --git a/man2html-localized-manpage-paths.patch b/man2html-localized-manpage-paths.patch new file mode 100644 index 0000000..38f2304 --- /dev/null +++ b/man2html-localized-manpage-paths.patch @@ -0,0 +1,78 @@ +diff -ru ../man-1.6g/man2html/locales/fr/man2html.1 ./man2html/locales/fr/man2html.1 +--- ../man-1.6g/man2html/locales/fr/man2html.1 2006-01-25 18:20:42.000000000 -0500 ++++ ./man2html/locales/fr/man2html.1 2012-07-16 06:38:00.729431350 -0400 +@@ -45,7 +45,7 @@ + .LP + .TS + l l. +-foo(3x) "http://localhost/cgi-bin/man/man2html?3x+foo" ++foo(3x) "http://localhost/man/man2html?3x+foo" + method://string "method://string" + www.host.name "http://www.host.name" + ftp.host.name "ftp://ftp.host.name" +@@ -94,7 +94,7 @@ + .TP + .B \-\^l + Positionner method:cgipath à +-.RI lynxcgi: /home/httpd . ++.RI lynxcgi: /usr/lib/man2html . + .TP + .BI \-\^L " dir" + Positionner method:cgipath à +@@ -102,7 +102,7 @@ + .TP + .BI \-\^M " man2htmlpath" + Positionner le chemin vers man2html à utiliser. La valeur par défaut est +-.IR /cgi-bin/man/man2html . ++.IR /man/man2html . + .TP + .B \-\^p + Positionner le séparateur à «\ /\ ». +@@ -122,7 +122,7 @@ + quel autre navigateur pour parcourir les pages de manuel en utilisant + la méthode http. + L'option \-l (pour «\ lynxcgi\ ») sélectionne ce fonctionnement. +-Avec elle, le chemin cgi par défaut est \fI/home/httpd\fP. ++Avec elle, le chemin cgi par défaut est \fI/usr/lib/man2html\fP. + + En général, un script cgi peut être appelé de la façon suivante + .IP +diff -ru ../man-1.6g/man2html/locales/it/man2html.1 ./man2html/locales/it/man2html.1 +--- ../man-1.6g/man2html/locales/it/man2html.1 2006-08-02 14:33:41.000000000 -0400 ++++ ./man2html/locales/it/man2html.1 2012-07-16 06:42:38.028418717 -0400 +@@ -44,7 +44,7 @@ + .LP + .TS + l l. +-foo(3x) "http://localhost/cgi-bin/man/man2html?3x+foo" ++foo(3x) "http://localhost/man/man2html?3x+foo" + method://string "method://string" + www.host.name "http://www.host.name" + ftp.host.name "ftp://ftp.host.name" +@@ -94,7 +94,7 @@ + .TP + .B \-\^l + Set method:cgipath to +-.RI lynxcgi: /home/httpd . ++.RI lynxcgi: /usr/lib/man2html . + .TP + .BI \-\^L " dir" + Set method:cgipath to +@@ -102,7 +102,7 @@ + .TP + .BI \-\^M " man2htmlpath" + Imposta il man2htmlpath da usare. Il valore predefinito è +-.IR /cgi-bin/man/man2html . ++.IR /man/man2html . + .TP + .B \-\^p + Imposta '/' come separatore. +@@ -121,7 +121,7 @@ + Quando è attivo qualche demone http, lynx, o qualunque altro browser, + può essere usato per navigare le man page, usando il metodo http. + L'opzione \-l (per `lynxcgi') seleziona il comportamento precedente. +-Con esso, il valore predefinito di cgipath è \fI/home/httpd\fP. ++Con esso, il valore predefinito di cgipath è \fI/usr/lib/man2html\fP. + + In generale, uno script cgi può essere chiamato da + .IP diff --git a/man2html.spec b/man2html.spec index 7fcd723..2a1c44d 100644 --- a/man2html.spec +++ b/man2html.spec @@ -3,7 +3,7 @@ Name: man2html Version: 1.6 -Release: 6.%{posttag}%{?dist} +Release: 7.%{posttag}%{?dist} Summary: Convert man pages to HTML - CGI scripts # man2html.c and debian/sources/man2html.cgi.c are Copyright Only @@ -106,6 +106,9 @@ Patch7: man2html-format.patch # (e.g. when just invoking `hman 1`) Patch8: man2html-hman-section.patch +# fix the paths in localized manpages +Patch9: man2html-localized-manpage-paths.patch + BuildRequires: recode Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -158,12 +161,16 @@ make -C man2html DESTDIR=%{buildroot} install install-hman #install CGI scripts make -C debian/sources PREFIX=%{buildroot} install -#install localized manpages (French only; Italian is in man-pages-it) +#install localized manpages install -Dpm0644 man2html/locales/fr/man2html.1 %{buildroot}%{_mandir}/fr/man1/man2html.1 +install -Dpm0644 man2html/locales/it/man2html.1 %{buildroot}%{_mandir}/it/man1/man2html.1 +install -Dpm0644 man2html/locales/it/hman.1 %{buildroot}%{_mandir}/it/man1/hman.1 #convert localized manpages to UTF-8 recode latin1..utf8 \ - %{buildroot}%{_mandir}/fr/man1/man2html.1 + %{buildroot}%{_mandir}/fr/man1/man2html.1 \ + %{buildroot}%{_mandir}/it/man1/man2html.1 \ + %{buildroot}%{_mandir}/it/man1/hman.1 #install httpd configuration install -Dpm0644 %SOURCE2 %{buildroot}%{_sysconfdir}/httpd/conf.d/man2html.conf @@ -203,6 +210,10 @@ fi %changelog +* Mon Jul 16 2012 T.C. Hollingsworth - 1.6-7.g +- restore Italian manpages +- fix paths in localized manpages + * Thu May 24 2012 T.C. Hollingsworth - 1.6-6.g - fix hman bug that caused linked to wrong URLs for sections (e.g. `hman 1`) - don't ship Italian man pages; they're provided by man-pages-it