From 1fe3accde87f762625bf25a0049a424e4f4c7a7a Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 23 Oct 2003 17:13:58 +0000 Subject: [PATCH] - up to 5.4.0 - updated ac25x,system-expat patches, removed obsolete nowarning patch - added amfix patch for new *.am issues - -devel R: openssl-devel, zlib-devel - added ru,uk summaries/descriptions from KSI Linux Changed files: w3c-libwww-ac25x.patch -> 1.3 w3c-libwww-amfix.patch -> 1.1 w3c-libwww-nowarning.patch -> 1.2 w3c-libwww-system-expat.patch -> 1.2 w3c-libwww.spec -> 1.32 --- w3c-libwww-ac25x.patch | 17 -------- w3c-libwww-amfix.patch | 22 ++++++++++ w3c-libwww-nowarning.patch | 10 ----- w3c-libwww-system-expat.patch | 47 +++++++++------------- w3c-libwww.spec | 76 +++++++++++++++++++++++++++++------ 5 files changed, 104 insertions(+), 68 deletions(-) create mode 100644 w3c-libwww-amfix.patch delete mode 100644 w3c-libwww-nowarning.patch diff --git a/w3c-libwww-ac25x.patch b/w3c-libwww-ac25x.patch index 0bb0f41..71c8491 100644 --- a/w3c-libwww-ac25x.patch +++ b/w3c-libwww-ac25x.patch @@ -242,15 +242,6 @@ [ AC_HEADER_INCLUDE(tmp_inc_errno, errno.h sys/errno.h) --- w3c-libwww-5.3.2/configure.in~ Sat Mar 2 06:46:58 2002 +++ w3c-libwww-5.3.2/configure.in Sat Mar 2 06:46:58 2002 -@@ -213,7 +213,7 @@ - getlogin getpass fcntl readdir sysinfo ioctl chdir tempnam \ - getsockopt setsockopt \ - gettimeofday mktime timegm tzset) --AC_CHECK_FUNC(unlink, , AC_CHECK_FUNC(remove, AC_DEFINE(unlink, remove))) -+AC_CHECK_FUNC(unlink, [], [AC_CHECK_FUNC(remove, AC_DEFINE(unlink, remove))]) - - dnl Checks for configuration arguments - AC_MSG_CHECKING(whether to support direct WAIS access.) @@ -986,7 +986,8 @@ ;; *) @@ -261,11 +252,3 @@ ;; esac ], AC_MSG_RESULT(no) -@@ -1006,7 +1006,6 @@ - Library/Makefile Library/User/Makefile Library/User/Patch/Makefile - Library/User/Architecture/Makefile Library/User/Using/Makefile Library/User/Guide/Makefile - Library/User/Style/Makefile Library/User/Platform/Makefile --Library/Test/Makefile Library/Test/User/Makefile Library/Test/src/Makefile - Library/src/Makefile Library/src/windows/Makefile Library/src/vms/Makefile - Library/src/SSL/Makefile Library/src/SSL/windows/Makefile - Library/Examples/Makefile diff --git a/w3c-libwww-amfix.patch b/w3c-libwww-amfix.patch new file mode 100644 index 0000000..d590987 --- /dev/null +++ b/w3c-libwww-amfix.patch @@ -0,0 +1,22 @@ +--- w3c-libwww-5.4.0/Makefile.am.orig 2002-06-12 11:32:59.000000000 +0200 ++++ w3c-libwww-5.4.0/Makefile.am 2003-10-23 00:32:42.756648688 +0200 +@@ -42,7 +42,6 @@ + chmod -R a+r $(distdir) + zip -rq $(distdir).zip $(distdir) + $(TAR) chofz $(distdir).tgz $(distdir) +- # gzip -f $(distdir).tar + + # Tag before making distribution. Also, don't make a distribution if + # checks fail. +--- w3c-libwww-5.4.0/Library/User/Makefile.am.orig 2002-06-06 16:59:37.000000000 +0200 ++++ w3c-libwww-5.4.0/Library/User/Makefile.am 2003-10-23 00:57:54.843776504 +0200 +@@ -11,9 +11,6 @@ + + SUBDIRS = Patch Architecture Using Guide Style Platform + +-BUILT_SOURCES = \ +- Extrnals.html +- + SUFFIXES = .html + + DEPENDENCIES = \ diff --git a/w3c-libwww-nowarning.patch b/w3c-libwww-nowarning.patch deleted file mode 100644 index 647ae05..0000000 --- a/w3c-libwww-nowarning.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- w3c-libwww-5.3.2/Library/src/HTXML.h.orig Fri Jun 13 10:18:21 2003 -+++ w3c-libwww-5.3.2/Library/src/HTXML.h Fri Jun 13 10:26:14 2003 -@@ -101,7 +101,6 @@ - starget); - #endif - --/* - */ - - #endif diff --git a/w3c-libwww-system-expat.patch b/w3c-libwww-system-expat.patch index c11986a..7873432 100644 --- a/w3c-libwww-system-expat.patch +++ b/w3c-libwww-system-expat.patch @@ -136,9 +136,9 @@ $(LIBS) ---- w3c-libwww-5.3.2/configure.in.orig Sat Jan 25 13:50:01 2003 -+++ w3c-libwww-5.3.2/configure.in Sat Jan 25 14:32:15 2003 -@@ -475,24 +475,24 @@ +--- w3c-libwww-5.4.0/configure.in.orig 2002-06-12 11:26:46.000000000 +0200 ++++ w3c-libwww-5.4.0/configure.in 2003-10-23 00:25:01.459776472 +0200 +@@ -497,24 +497,24 @@ AC_MSG_RESULT(yes) AC_DEFINE(HT_EXPAT) HTXML="HTXML.lo" @@ -153,7 +153,7 @@ - LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la' + LWWWXML="-lwwwxml -lexpat" + LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la -lexpat' - SHOWXML="showxml ptri stri rdf_parse_file rdf_parse_buffer" + SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)' ;; esac ], AC_MSG_RESULT(yes) @@ -170,11 +170,24 @@ - LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la' + LWWWXML="-lwwwxml -lexpat" + LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la -lexpat' - SHOWXML="showxml ptri stri rdf_parse_file rdf_parse_buffer" + SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)' ) AC_SUBST(HTXML) # for old style big library --- w3c-libwww-5.3.2/Library/src/HTXML.h.orig Wed Dec 20 12:00:07 2000 +++ w3c-libwww-5.3.2/Library/src/HTXML.h Sat Jan 25 14:33:46 2003 +@@ -19,11 +19,7 @@ + of the W3C Sample Code Library. + + We use James Clark's expat +-XML parser which is very neat indeed. As the code doesn't come as a separate +-library, I included it in the libwww CVS code base where I compile is as +-two libraries: libxmltok.a and libxmlparse.a. See +-the external modules that libwww works with for +-details. Thanks so much to John Punin for writing this code! ++XML parser which is very neat indeed. + */ + + #ifndef HTXML_H @@ -36,7 +36,7 @@ #include "SGML.h" #endif /* HT_STRUCT_XML_STREAM */ @@ -184,27 +197,3 @@ /* . ---- w3c-libwww-5.3.2/Library/src/HTXML.html.orig Tue Dec 19 09:53:43 2000 -+++ w3c-libwww-5.3.2/Library/src/HTXML.html Sat Jan 25 14:35:10 2003 -@@ -17,11 +17,7 @@ - of the W3C Sample Code Library. -

- We use James Clark's expat --XML parser which is very neat indeed. As the code doesn't come as a separate --library, I included it in the libwww CVS code base where I compile is as --two libraries: libxmltok.a and libxmlparse.a. See --the external modules that libwww works with for --details. Thanks so much to John Punin for writing this code! -+XML parser which is very neat indeed. - 

- #ifndef HTXML_H
- #define HTXML_H
-@@ -33,7 +29,7 @@
- #include "SGML.h"
- #endif /* HT_STRUCT_XML_STREAM */
- 
--#include <xmlparse.h>
-+#include <expat.h>
-
-

- Libwww Stream Converter diff --git a/w3c-libwww.spec b/w3c-libwww.spec index 3927445..9a807e7 100644 --- a/w3c-libwww.spec +++ b/w3c-libwww.spec @@ -1,17 +1,19 @@ Summary: HTTP library of common code Summary(pl): Biblioteka wspólnego kodu HTTP Summary(pt_BR): Biblioteca HTTP de uso geral +Summary(ru): HTTP-ÂÉÂÌÉÏÔÅËÁ ÏÂÝÅÕÐÏÔÒÅÂÉÔÅÌØÎÏÇÏ ËÏÄÁ +Summary(uk): HTTP-¦Â̦ÏÔÅËÁ ÚÁÇÁÌØÎÏ×ÖÉ×ÁÎÏÇÏ ËÏÄÕ Name: w3c-libwww -Version: 5.3.2 -Release: 9 +Version: 5.4.0 +Release: 1 License: W3C (see: http://www.w3.org/Consortium/Legal/copyright-software.html) Group: Libraries -Source0: http://www.w3.org/Library/Distribution/%{name}-%{version}.tar.gz +Source0: http://www.w3.org/Library/Distribution/%{name}-%{version}.tgz # Source0-md5: 9bff5c3269d959a49aaf667977676880 Patch0: %{name}-ac25x.patch Patch1: %{name}-am15.patch Patch2: %{name}-system-expat.patch -Patch3: %{name}-nowarning.patch +Patch3: %{name}-amfix.patch Icon: Lib48x.gif URL: http://www.w3.org/Library/ BuildRequires: autoconf @@ -46,12 +48,32 @@ clientes, rob implementação HTTP exemplo altamente otimizada para servidor como um ambiente de testes para experimentações com protocolos. +%description -l ru +Libwww - ÜÔÏ Web API ÏÂÝÅÇÏ ÎÁÚÎÁÞÅÎÉÑ, ÎÁÐÉÓÁÎÎÙÅ ÎÁ C ÄÌÑ Unix É +Windows (Win32). éÍÅÑ ÒÁÓÛÉÒÑÅÍÙÅ ÍÎÏÇÏÕÒÏ×ÎÅ×ÙÅ API, ÏÎÁ ÐÒÉÇÏÄÎÁ ÄÌÑ +ÐÏÓÔÒÏÅÎÉÑ ÍÎÏÖÅÓÔ×Á ÒÁÚÌÉÞÎÙÈ ÔÉÐÏ× ÐÒÉÌÏÖÅÎÉÊ ×ËÌÀÞÁÑ ËÌÉÅÎÔÏ×, +ÒÏÂÏÔÏ× etc. Libwww Ñ×ÌÑÅÔÓÑ ÐÒÉÍÅÒÏÍ ×ÙÓÏËÏÏÐÔÉÍÉÚÉÒÏ×ÁÎÎÏÊ +ÒÅÁÌÉÚÁÃÉÉ HTTP É ÄÒÕÇÉÈ éÎÔÅÒÎÅÔ-ÐÒÏÔÏËÏÌÏ× É ÔÅÓÔÏ×ÏÊ ÓÒÅÄÏÊ ÄÌÑ +ÜËÓÐÅÒÉÍÅÎÔÏ× Ó ÐÒÏÔÏËÏÌÁÍÉ. + +%description -l uk +Libwww - ÃÅ Web API ÚÁÇÁÌØÎÏÇÏ ÐÒÉÚÎÁÞÅÎÎÑ, ÎÁÐÉÓÁΦ ÎÁ C ÄÌÑ Unix ÔÁ +Windows (Win32). íÁÀÞÉ ÒÏÚÛÉÒÀ×ÁΦ ÂÁÇÁÔÏÒ¦×ÎÅצ API, ×ÏÎÁ ÐÒÉÄÁÔÎÁ +ÄÌÑ ÐÏÂÕÄÏ×É ×ÅÌÉËϧ ˦ÌØËÏÓÔ¦ Ò¦ÚÎÉÈ Ò¦ÚÎÉÈ ÔÉÐ¦× ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ +×ËÌÀÞÁÀÞÉ Ë̦¤ÎÔ¦×, ÒÏÂÏÔ¦× etc. Libwww ¤ ÐÒÉËÌÁÄÏÍ +×ÉÓÏËÏÏÐÔÉͦÚÏ×ÁÎϧ ÒÅÁ̦ÚÁæ§ HTTP ÔÁ ¦ÎÛÉÈ ¶ÎÔÅÒÎÅÔ-ÐÒÏÔÏËÏÌ¦× ÔÁ +ÔÅÓÔÏ×ÉÍ ÓÅÒÅÄÏ×ÉÝÅÍ ÄÌÑ ÅËÓÐÅÒÉÍÅÎÔ¦× Ú ÐÒÏÔÏËÏÌÁÍÉ. + %package devel Summary: Header files for programs that use libwww Summary(pl): Pliki nag³ówkowe dla programów u¿ywaj±cych libwww Summary(pt_BR): Arquivos necessários para desenvolvimento com a libwww +Summary(ru): âÉÂÌÉÏÔÅËÉ É ÈÅÄÅÒÙ ÄÌÑ ÐÒÏÇÒÁÍÍ, ËÏÔÏÒÙÅ ÉÓÐÏÌØÚÕÀÔ libwww +Summary(uk): â¦Â̦ÏÔÅËÉ ÔÁ ÈÅÄÅÒÉ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ libwww Group: Development/Libraries Requires: %{name} = %{version} +Requires: openssl-devel >= 0.9.7c +Requires: zlib-devel %description devel Header files for libwww, which are available as public libraries. @@ -63,6 +85,12 @@ Pliki nag Bibliotecas e arquivos de inclusão para desenvolvimento baseado na libwww, que está disponível ao público. +%description devel -l ru +âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ É ÈÅÄÅÒÙ ÄÌÑ libwww. + +%description devel -l uk +â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ ÔÁ ÈÅÄÅÒÉ ÄÌÑ libwww. + %package static Summary: Static libwww libraries Summary(pl): Statyczne biblioteki libwww @@ -83,9 +111,11 @@ Bibliotecas est Summary: Applications built using Libwww web library: e.g. Robot, command line tool, etc Summary(pl): Aplikacje u¿ywaj±ce Libwww: Robot, narzêdzie command-line itp Summary(pt_BR): Aplicativos construídos usando a libwww +Summary(ru): ðÒÉÌÏÖÅÎÉÑ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ Libwww - ÒÏÂÏÔ, ÕÔÉÌÉÔÁ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ É Ô.Ð. +Summary(uk): ðÒÏÇÒÁÍÉ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ Libwww - ÒÏÂÏÔ, ÕÔÉ̦ÔÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÁ ¦ Ô.¦. Group: Applications/Networking -Requires: %{name} = %{version} Icon: robot48x.gif +Requires: %{name} = %{version} %description apps Web applications built using Libwww: Robot, Command line tool, line @@ -118,6 +148,32 @@ A Ferramenta de execu manipulação de sítios Web que implementam mais do que um HTTP GET (por exemplo, PUT, POST, etc.) +%description apps -l ru +Web-ÐÒÉÌÏÖÅÎÉÑ, ÐÏÓÔÒÏÅÎÎÙÅ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ Libwww - ÒÏÂÏÔ, ÕÔÉÌÉÔÁ +ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ, ÓÔÒÏÞÎÙÊ ÂÒÁÕÚÅÒ. òÏÂÏÔ ÍÏÖÅÔ ÂÒÏÄÉÔØ ÐÏ web-ÓÁÊÔÁÍ +ÂÙÓÔÒÅÅ É Ó ÍÅÎØÛÅÊ ÎÁÇÒÕÚËÏÊ ÞÅÍ ÌÀÂÁÑ ÄÒÕÇÁÑ ÉÚ×ÅÓÔÎÁÑ ÎÁÍ ÂÒÏÄÉÌËÁ +ÉÚ-ÚÁ ÉÓËÌÀÞÉÔÅÌØÎÏÊ ËÏÎ×ÅÊÅÒÉÚÁÃÉÉ É ÉÓÐÏÌØÚÏ×ÁÎÉÑ HTTP/1.1. + +õÔÉÌÉÔÁ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ (w3c) ÏÞÅÎØ ÐÏÌÅÚÎÁ ÄÌÑ ÒÁÂÏÔÙ Ó web-ÓÁÊÔÁÍÉ, +ËÏÔÏÒÙÅ ÒÅÁÌÉÚÕÀÔ ÂÏÌØÛÅ ËÏÍÁÎÄ ÞÅÍ ÐÒÏÓÔÏ HTTP GET (ÎÁÐÒÉÍÅÒ, PUT, +POST, etc.). + +óÔÒÏÞÎÙÊ ÂÒÁÕÚÅÒ - ÜÔÏ ÍÉÎÉÍÁÌØÎÙÊ web-ÂÒÁÕÚÅÒ, ÒÁÂÏÔÁÀÝÉÊ × ËÏÍÁÎÄÎÏÍ +ÒÅÖÉÍÅ. þÁÓÔÏ ÐÏÌÅÚÅÎ ÄÌÑ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ × ÔÅËÓÔÏ×ÙÊ ÆÏÒÍÁÔ. + +%description apps -l uk +Web-ÐÒÏÇÒÁÍÉ, ÐÏÂÕÄÏ×ÁΦ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ Libwww - ÒÏÂÏÔ, ÕÔÉ̦ÔÁ +ËÏÍÁÎÄÎϧ ÓÔÒ¦ÞËÉ, ËÏÍÁÎÄÎÉÊ ÂÒÁÕÚÅÒ. òÏÂÏÔ ÍÏÖÅ ÈÏÄÉÔÉ ÐÏ web-ÓÁÊÔÁÈ +Û×ÉÄÛÅ ÔÁ Ú ÍÅÎÛÉÍ ÚÁ×ÁÎÔÁÖÅÎÎÑÍ Î¦Ö ÂÕÄØ-ÑËÁ צÄÏÍÁ ÎÁÍ ÈÏÄÉÌËÁ +ÚÁ×ÄÑËÉ ×ÉËÌÀÞÎ¦Ê ËÏÎ×ÅʤÒÉÚÁæ§ ÔÁ ×ÉËÏÒÉÓÔÁÎÎÀ HTTP/1.1. + +õÔÉ̦ÔÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÁ (w3c) ÄÕÖÅ ËÏÒÉÓÎÁ ÄÌÑ ÒÏÂÏÔÉ Ú web-ÓÁÊÔÁÍÉ, +Ñ˦ ÒÅÁ̦ÚÕÀÔØ Â¦ÌØÛÅ ËÏÍÁÎÄ Î¦Ö ÐÒÏÓÔÏ HTTP GET (ÎÁÐÒÉËÌÁÄ, PUT, +POST, etc.). + +ëÏÍÁÎÄÎÉÊ ÂÒÁÕÚÅÒ - ÊͦΦÍÁÌØÎÉÊ web-ÂÒÁÕÚÅÒ, ÝÏ ÐÒÁÃÀ¤ × ËÏÍÁÎÄÎÏÍÕ +ÒÅÖÉͦ. þÁÓÔÏ ËÏÒÉÓÎÉÊ ÄÌÑ ÐÅÒÅÔ×ÏÒÅÎÎÑ Õ ÔÅËÓÔÏ×ÉÊ ÆÏÒÍÁÔ. + %prep %setup -q %patch0 -p1 @@ -126,7 +182,6 @@ exemplo, PUT, POST, etc.) %patch3 -p1 %build -rm -f missing %{__libtoolize} %{__aclocal} %{__autoconf} @@ -143,10 +198,8 @@ rm -f missing %install rm -rf $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT - -%{__mkdir} documentation -%{__cp} -p --parents *.html */*.html */*/*.html documentation +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -156,7 +209,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc documentation/* Icons/*/*.gif +%doc COPYRIGHT.html ChangeLog LICENSE.html %attr(755,root,root) %{_libdir}/libwww*.so.*.* %attr(755,root,root) %{_libdir}/libmd5.so.*.* %attr(755,root,root) %{_libdir}/libpics.so.*.* @@ -177,7 +230,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libwww*.la %{_libdir}/libmd5.la %{_libdir}/libpics.la - %{_includedir}/wwwconf.h %{_includedir}/w3c-libwww -- 2.43.0