Author: glen Date: Sun Feb 7 22:20:03 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.9.35
---- Files affected: packages/pavuk: pavuk-desktop.patch (1.6 -> 1.7) , pavuk-fixes.patch (1.4 -> 1.5) , pavuk.spec (1.66 -> 1.67) , pavuk-open-args-typo.patch (NONE -> 1.1) (NEW), pavuk-digest_auth.c.patch (1.1 -> NONE) (REMOVED), pavuk-http.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/pavuk/pavuk-desktop.patch diff -u packages/pavuk/pavuk-desktop.patch:1.6 packages/pavuk/pavuk-desktop.patch:1.7 --- packages/pavuk/pavuk-desktop.patch:1.6 Wed May 18 00:00:00 2005 +++ packages/pavuk/pavuk-desktop.patch Sun Feb 7 23:19:57 2010 @@ -1,25 +1,14 @@ -diff -ur pavuk-0.9pl29d.orig/pavuk.desktop pavuk-0.9pl29d/pavuk.desktop ---- pavuk-0.9pl29d.orig/pavuk.desktop Sat Nov 2 22:30:28 2002 -+++ pavuk-0.9pl29d/pavuk.desktop Sat Nov 2 23:55:58 2002 -@@ -1,11 +1,15 @@ - [Desktop Entry] - Name=Pavuk --Name[sk]=Pav�k --Name[cs]=Pav�k -+Name[cs]=Pavúk -+Name[sk]=Pavúk - Comment=Recursive World Wide Web mirroring tool for HTTP, HTTPS, FTP and Gopher protocols --Comment[sk]=N�stroj na rekurz�vne kop�rovanie dokumentov z WWW cez protokoly HTTP, HTTPS, FTP, FTPS a Gopher --Comment[cs]=N�stroj na rekurzivn� kop�rov�n� dokument� z WWW pomoc� protokol� HTTP, HTTPS, FTP, FTPS a Gopher -+Comment[cs]=Nástroj na rekurzivní kopírování dokumentů z WWW pomocí protokolů HTTP, HTTPS, FTP, FTPS a Gopher +--- pavuk-0.9.35/pavuk.desktop~ 2010-02-08 00:05:16.000000000 +0200 ++++ pavuk-0.9.35/pavuk.desktop 2010-02-08 00:06:25.613115003 +0200 +@@ -6,8 +6,9 @@ + Comment[sk]=Nástroj na rekurzívne kopírovanie dokumentov z WWW cez protokoly HTTP, HTTPS, FTP, FTPS a Gopher + Comment[cs]=Nástroj na rekurzivní kopírování dokumentù z WWW pomocí protokolù HTTP, HTTPS, FTP, FTPS a Gopher + Comment[de]=Rekursives WWW-Speicherprogramm für die Protokolle HTTP, HTTPS, FTP und Gopher +Comment[pl]=Program do rekurencyjnego kopiowania stron WWW wspierający protokoły HTTP, HTTPS, FTP, FTPS i Gopher -+Comment[sk]=Nástroj na rekurzívne kopírovanie dokumentov z WWW cez protokoly HTTP, HTTPS, FTP, FTPS a Gopher Exec=pavuk -X - Icon=pavuk.png + Icon=pavuk -Terminal=0 --Type=Internet +Terminal=false -+Type=Application + Type=Application +-Categories=Network;FileTransfer +Categories=GTK;Network;FileTransfer; -+Encoding=UTF-8 -+# vi: encoding=utf-8 ================================================================ Index: packages/pavuk/pavuk-fixes.patch diff -u packages/pavuk/pavuk-fixes.patch:1.4 packages/pavuk/pavuk-fixes.patch:1.5 --- packages/pavuk/pavuk-fixes.patch:1.4 Tue Feb 12 12:13:17 2002 +++ packages/pavuk/pavuk-fixes.patch Sun Feb 7 23:19:57 2010 @@ -1,36 +1,12 @@ ---- pavuk-0.9pl29d/Makefile.am.orig Tue Sep 18 23:08:14 2001 -+++ pavuk-0.9pl29d/Makefile.am Tue Feb 12 11:56:19 2002 -@@ -48,18 +48,8 @@ - BZIP2=-9 tar -cjf pavuk-$(VERSION).tar.bz2 pavuk-$(VERSION);\ - rm -rf pavuk-$(VERSION) - -+desktopdir=$(GNOME_PREFIX)/share/gnome/apps/Internet -+desktop_DATA= pavuk.desktop - --install-data-local: -- if test -n "$(DESTDIR)$(GNOME_PREFIX)"; then \ -- $(mkinstalldirs) $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/Internet; \ -- $(INSTALL_DATA) $(srcdir)/pavuk.desktop $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/Internet; \ -- $(mkinstalldirs) $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \ -- $(INSTALL_DATA) $(srcdir)/icons/pavuk_64x64.xpm $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \ -- fi -- --uninstall-local: -- if test -n "$(GNOME_PREFIX)"; then \ -- rm -f $(DESTDIR)$(GNOME_PREFIX)/share/gnome/apps/Internet/pavuk.desktop; \ -- rm -f $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/pavuk_64x64.xpm; \ -- fi -- -+pixmapsdir=$(GNOME_PREFIX)/share/pixmaps -+pixmaps_DATA=pavuk.png -diff -urN pavuk-0.9pl27.org/pavuk.desktop pavuk-0.9pl27/pavuk.desktop ---- pavuk-0.9pl27.org/pavuk.desktop Fri May 11 19:17:31 2001 -+++ pavuk-0.9pl27/pavuk.desktop Fri May 11 19:17:58 2001 -@@ -6,6 +6,6 @@ - Comment[sk]=N�stroj na rekurz�vne kop�rovanie dokumentov z WWW cez protokoly HTTP, HTTPS, FTP, FTPS a Gopher - Comment[cs]=N�stroj na rekurzivn� kop�rov�n� dokument� z WWW pomoc� protokol� HTTP, HTTPS, FTP, FTPS a Gopher - Exec=pavuk -X --Icon=pavuk_64x64.xpm -+Icon=pavuk.png - Terminal=0 - Type=Internet +--- pavuk-0.9.35/Makefile.am~ 2007-02-14 19:36:39.000000000 +0200 ++++ pavuk-0.9.35/Makefile.am 2010-02-08 00:02:16.553139772 +0200 +@@ -36,3 +36,9 @@ + bin_SCRIPTS = \ + scripts/pavuk.sh \ + scripts/tperf.sh ++ ++desktopdir=$(datarootdir)/applications ++desktop_DATA = pavuk.desktop ++ ++pixmapsdir=$(datarootdir)/pixmaps ++pixmaps_DATA = pavuk.png ================================================================ Index: packages/pavuk/pavuk.spec diff -u packages/pavuk/pavuk.spec:1.66 packages/pavuk/pavuk.spec:1.67 --- packages/pavuk/pavuk.spec:1.66 Tue Feb 13 08:16:52 2007 +++ packages/pavuk/pavuk.spec Sun Feb 7 23:19:57 2010 @@ -6,22 +6,21 @@ Summary(pl.UTF-8): Narzędzie do nieinteraktywnego ściągania stron WWW Summary(sk.UTF-8): Program na zrkadlenie HTTP, FTP a Gopher serverov Name: pavuk -Version: 0.9pl29d -Release: 7 +Version: 0.9.35 +Release: 1 Epoch: 1 License: GPL Group: Networking/Utilities -Source0: http://www.idata.sk/~ondrej/sw/%{name}-%{version}.tgz -# Source0-md5: 933bf6dc0aaf1afbf9d6ac8d557435a9 +Source0: http://downloads.sourceforge.net/project/pavuk/pavuk/%{version}/%{name}-%{version}.tar.bz2 +# Source0-md5: 6204c7a1339433ab32456ccd62126ea9 Source1: %{name}.png Patch0: %{name}-fixes.patch Patch1: %{name}-ac.patch Patch2: %{name}-desktop.patch -Patch3: %{name}-http.patch -Patch4: %{name}-digest_auth.c.patch -URL: http://www.idata.sk/~ondrej/pavuk/ -BuildRequires: automake +Patch3: %{name}-open-args-typo.patch +URL: http://www.pavuk.org/ BuildRequires: autoconf +BuildRequires: automake BuildRequires: db-devel BuildRequires: gettext-devel BuildRequires: gtk+-devel @@ -37,8 +36,8 @@ files. It transfers documents from HTTP, FTP and Gopher servers. %description -l cs.UTF-8 -Pavuk je program používaný pro zrcadlení obsahu WWW dokumentů -pomocí protokolů HTTP, FTP, Gopher a HTTPS (SSL). +Pavuk je program používaný pro zrcadlení obsahu WWW dokumentů pomocí +protokolů HTTP, FTP, Gopher a HTTPS (SSL). %description -l fr.UTF-8 Pavuk est un programme utilisé pour mirrorer le contenu de documents @@ -58,15 +57,12 @@ %prep %setup -q +mv pavuk.desktop pavuk.desktop.latin1 +iconv -flatin1 -tutf8 pavuk.desktop.latin1 > pavuk.desktop %patch0 -p1 -%patch1 -p1 %patch2 -p1 -cd src -%patch3 -p0 -%patch4 -p0 -cd .. - -cp %{SOURCE1} . +%patch3 -p1 +cp -a %{SOURCE1} . %build # don't run gettextize, pavuk has its own po install system using automake @@ -97,9 +93,9 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO pavukrc.sample pavuk_authinfo.sample %attr(755,root,root) %{_bindir}/pavuk +%{_mandir}/man1/pavuk.1* %{_desktopdir}/*.desktop -%{_pixmapsdir}/* -%{_mandir}/man?/* +%{_pixmapsdir}/*.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -107,6 +103,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.67 2010/02/07 22:19:57 glen +- up to 0.9.35 + Revision 1.66 2007/02/13 07:16:52 glen - tabs in preamble @@ -163,25 +162,25 @@ - forgotten: release 2, STBR Revision 1.48 2002/11/02 23:06:12 ankry -- really new %%doc, use %%{_examplesdir} +- really new %doc, use %{_examplesdir} - added -ac patch (fixed build with autoconf-2.53a) - added -desktop patch (pl entry + converted to UTF8) - cleaning, translations from RH Revision 1.47 2002/10/09 13:14:42 kloczek - use more macros, some cosmetics, added missing "rm -f missing" and use new - %%doc + %doc Revision 1.46 2002/06/23 20:52:53 kloczek -perl -pi -e "s/^gettextize --copy --force/\%%\{__gettextize\}/" +- perl -pi -e "s/^gettextize --copy --force/\%\{__gettextize\}/" Revision 1.45 2002/06/23 20:32:33 kloczek - perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/" Revision 1.44 2002/05/21 23:14:20 kloczek -perl -pi -e "s/^automake -a -c -f --foreign/\%\{__automake\}/; \ +- perl -pi -e "s/^automake -a -c -f --foreign/\%\{__automake\}/; \ s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" + s/^autoconf/\%\{__autoconf\}/" Revision 1.43 2002/03/24 23:28:23 kloczek - perl -pi -e "s/^automake -a -c$/automake -a -c -f/" @@ -197,7 +196,7 @@ - added Group(es/pt_BR) Revision 1.39 2002/01/18 02:14:09 kloczek -perl -pi -e "s/[email protected]/[email protected]/" +- perl -pi -e "s/[email protected]/[email protected]/" Revision 1.38 2001/05/11 18:22:30 kloczek - make libtool happy. @@ -218,10 +217,10 @@ - removed gettext-devel from BuildRequires. Revision 1.33 2000/06/09 07:54:45 kloczek -- more %%{__make} macros. +- more %{__make} macros. Revision 1.32 2000/06/09 07:23:27 kloczek -- added using %%{__make} macro. +- added using %{__make} macro. Revision 1.31 2000/06/07 04:21:51 kloczek - spec adapterized. @@ -249,7 +248,7 @@ - added SSL support. Revision 1.25 1999/12/21 21:45:31 wiget -0.9pl23 +- 0.9pl23 Revision 1.24 1999/12/02 01:44:18 kloczek - fixed man pages location. @@ -271,8 +270,3 @@ Revision 1.18 1999/07/12 23:06:12 kloczek - added using CVS keywords in %changelog (for automating them). - -* Sun May 9 1999 Tomasz Kłoczko <[email protected]> - [0.9pl12-1] -- now package is FHS 2.0 compliant, -- rewrited from spec obtained from RH contrib. ================================================================ Index: packages/pavuk/pavuk-open-args-typo.patch diff -u /dev/null packages/pavuk/pavuk-open-args-typo.patch:1.1 --- /dev/null Sun Feb 7 23:20:03 2010 +++ packages/pavuk/pavuk-open-args-typo.patch Sun Feb 7 23:19:57 2010 @@ -0,0 +1,11 @@ +--- pavuk-0.9.35/src/tools.c~ 2006-02-27 18:24:13.000000000 +0200 ++++ pavuk-0.9.35/src/tools.c 2010-02-08 00:12:58.549950450 +0200 +@@ -1726,7 +1726,7 @@ + if(length < 0) + length = strlen(content); + +- if((fd = open(filename, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC), 0644) < 0) ++ if((fd = open(filename, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, 0644)) < 0) + { + xperror(filename); + return -1; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pavuk/pavuk-desktop.patch?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pavuk/pavuk-fixes.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pavuk/pavuk.spec?r1=1.66&r2=1.67&f=u
_______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
