- completly rewrited in PLD style.

Changed files:
    w3c-libwww.spec -> 1.2

diff --git a/w3c-libwww.spec b/w3c-libwww.spec
index fb8a407f36629f814506d9cb5c93b45baac7b7b4..d4c41065fabe8ea45f494924e4fc2730930d95b4 100644 (file)
--- a/w3c-libwww.spec
+++ b/w3c-libwww.spec
@@ -1,104 +1,113 @@
-# Note that this is NOT a relocatable package
-
-%define ver    5.2.8
-%define rel    3
-%define prefix /usr/
-
-Summary: HTTP library of common code
-Name: w3c-libwww
-Version: %ver
-Release: %rel
-Copyright: W3C (see: http://www.w3.org/Consortium/Legal/copyright-software.html)
-Group: System Environment/Libraries
-Source: http://www.w3.org/Library/Distribution/w3c-libwww-%{ver}.tar.gz
-URL: http://www.w3.org/Library
-BuildRoot: /var/tmp/%{name}-root
-Icon: Lib48x.gif
+Summary:       HTTP library of common code
+Name:          w3c-libwww
+Version:       5.2.8
+Release:       5
+Copyright:     W3C (see: http://www.w3.org/Consortium/Legal/copyright-software.html)
+Group:         Libraries
+Source:                http://www.w3.org/Library/Distribution/%{name}-%{version}.tar.gz
+Patch:         w3c-libwww-DESTDIR.patch
+URL:           http://www.w3.org/Library
+Icon:          Lib48x.gif
+BuildRoot:     /tmp/%{name}-%{version}-root
 
 %description
-Libwww is a general-purpose Web API written in C for Unix and Windows (Win32).
-With a highly extensible and layered API, it can accommodate many different
-types of applications including clients, robots, etc. The purpose of libwww
-is to provide a highly optimized HTTP sample implementation as well as other
-Internet protocols and to serve as a testbed for protocol experiments.
+Libwww is a general-purpose Web API written in C for Unix and Windows
+(Win32). With a highly extensible and layered API, it can accommodate many
+different types of applications including clients, robots, etc. The purpose
+of libwww is to provide a highly optimized HTTP sample implementation as
+well as other Internet protocols and to serve as a testbed for protocol
+experiments.
 
 %package devel
-Summary: Libraries and header files for programs that use libwww.
-Group: Development/Libraries
-Requires: w3c-libwww
+Summary:       Libraries and header files for programs that use libwww
+Group:         Development/Libraries
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Requires:      %{name} = %{version}
 
 %description devel
-Static libraries and header files for libwww, which are available as public
-libraries.
+Header files for libwww, which are available as public libraries.
 
-%package apps
-Summary: Applications built using Libwww web library: e.g. Robot, command line tool, etc.
-Group: Applications/Internet
-Requires: w3c-libwww
-Icon: robot48x.gif
-
-%description apps
+%package static
+Summary:       Static libwww libraries
+Group:         Development/Libraries
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Requires:      %{name}-devel = %{version}
 
-Web applications built using Libwww: Robot, Command line tool, 
-line mode browser.  The Robot can crawl web sites faster, and
-with lower load, than any other web walker that we know of, 
-due to its extensive pipelining and use of HTTP/1.1.
+%description static
+Static libwww libraries.
 
-The command line tool (w3c) is very useful for manipulation of 
-Web sites that implement more than just HTTP GET (e.g. PUT, 
- POST, etc.).
+%package apps
+Summary:       Applications built using Libwww web library: e.g. Robot, command line tool, etc
+Group:         Networking
+Group(pl):     Aplikacje/Sieciowe
+Requires:      %{name} = %{version}
+Icon:          robot48x.gif
 
-The line mode browser is a minimal line mode web browser; 
-often useful to convert to ascii text.  Currently unavailable
-until someone updates it to some new interfaces. (hint, hint...)
+%description apps
+Web applications built using Libwww: Robot, Command line tool, line mode
+browser. The Robot can crawl web sites faster, and with lower load, than any
+other web walker that we know of, due to its extensive pipelining and use of
+HTTP/1.1. The command line tool (w3c) is very useful for manipulation of Web
+sites that implement more than just HTTP GET (e.g. PUT, POST, etc.). The
+line mode browser is a minimal line mode web browser; often useful to
+convert to ascii text. Currently unavailable until someone updates it to
+some new interfaces. (hint, hint...)
 
 %prep
 %setup -q
+%patch -p1
 
 %build
-#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --with-regex --with-zlib
-#make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-
-%configure --enable-shared --with-gnu-ld --with-regex --with-zlib
+automake
+LDFLAGS="-s"; export LDFLAGS
+%configure \
+       --enable-shared \
+       --with-gnu-ld \
+       --with-regex \
+       --with-zlib
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-( cd $RPM_BUILD_ROOT
-  chmod +x ./usr/lib/lib{www*,xml*,md5}.so.0.*
-  strip ./usr/bin/* || :
-)
+make DESTDIR=$RPM_BUILD_ROOT install
 
+strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%{prefix}/lib/libwww*.so.*
-%{prefix}/lib/libxml*.so.*
-%{prefix}/lib/libmd5.so.*
-%{prefix}/share/w3c-libwww
-
+%defattr(644,root,root,755)
 %doc *.html */*.html */*/*.html Icons/*/*.gif
+%attr(755,root,root) %{_libdir}/libwww*.so.*.*
+%attr(755,root,root) %{_libdir}/libxml*.so.*.*
+%attr(755,root,root) %{_libdir}/libmd5.so.*.*
+%{_datadir}/w3c-libwww
 
 %files apps
-%defattr(-,root,root)
-%{prefix}/bin/webbot
-%{prefix}/bin/w3c
+%attr(755,root,root) %{_bindir}/webbot
+%attr(755,root,root) %{_bindir}/w3c
 
 %files devel
-%defattr(-,root,root)
-%{prefix}/bin/libwww-config
-%{prefix}/lib/lib*.a
-%{prefix}/lib/lib*.la
-%{prefix}/lib/lib*.so
-
-%{prefix}/include/xmlparse.h
-%{prefix}/include/w3c-libwww
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/libwww-config
+%attr(755,root,root) %{_libdir}/libwww*.so
+%attr(755,root,root) %{_libdir}/libxml*.so
+%attr(755,root,root) %{_libdir}/libmd5.so
+%attr(755,root,root) %{_libdir}/libwww*.la
+%attr(755,root,root) %{_libdir}/libxml*.la
+%attr(755,root,root) %{_libdir}/libmd5.la
+
+%{_includedir}/xmlparse.h
+%{_includedir}/w3c-libwww
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libwww*.a
+%{_libdir}/libxml*.a
+%{_libdir}/libmd5.a