- integrated automake fixes

Changed files:
    w3c-libwww-am15.patch -> 1.2
    w3c-libwww-amfix.patch -> 1.2
    w3c-libwww.spec -> 1.55

diff --git a/w3c-libwww-am15.patch b/w3c-libwww-am15.patch
deleted file mode 100644 (file)
index 9cf2bd8..0000000
--- a/w3c-libwww-am15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- w3c-libwww-5.3.2/Library/src/Makefile.am~  Sat Mar  2 06:40:12 2002
-+++ w3c-libwww-5.3.2/Library/src/Makefile.am   Sat Mar  2 06:40:12 2002
-@@ -47,8 +47,7 @@
-       perl $(top_srcdir)/config/winConfigure.pl $(srcdir)
-     endif
- 
--icondir = @icondir@
--CPPFLAGS := $(CPPFLAGS) -DW3C_ICONS=\"$(icondir)\"
-+CPPFLAGS = @CPPFLAGS@ -DW3C_ICONS=\"$(icondir)\"
- 
- inc: $(BUILT_SOURCES)
-       @echo Generated built sources
-@@ -539,7 +539,7 @@
- 
- pkginclude_HEADERS = $(BUILT_SOURCES)
- 
--DOCS :=       $(wildcard *.html)
-+DOCS =        $(wildcard *.html)
- 
- EXTRA_DIST = \
-       $(BUILT_SOURCES) \

diff --git a/w3c-libwww-amfix.patch b/w3c-libwww-amfix.patch
index d59098724fdad5210933238677346747e492ff10..67cd8a967d7ae40e556e04ec4f7a971dfc9bf4c9 100644 (file)
--- a/w3c-libwww-amfix.patch
+++ b/w3c-libwww-amfix.patch
@@ -1,3 +1,24 @@
+--- w3c-libwww-5.3.2/Library/src/Makefile.am~  Sat Mar  2 06:40:12 2002
++++ w3c-libwww-5.3.2/Library/src/Makefile.am   Sat Mar  2 06:40:12 2002
+@@ -47,8 +47,7 @@
+       perl $(top_srcdir)/config/winConfigure.pl $(srcdir)
+     endif
+ 
+-icondir = @icondir@
+-CPPFLAGS := $(CPPFLAGS) -DW3C_ICONS=\"$(icondir)\"
++CPPFLAGS = @CPPFLAGS@ -DW3C_ICONS=\"$(icondir)\"
+ 
+ inc: $(BUILT_SOURCES)
+       @echo Generated built sources
+@@ -539,7 +539,7 @@
+ 
+ pkginclude_HEADERS = $(BUILT_SOURCES)
+ 
+-DOCS :=       $(wildcard *.html)
++DOCS =        $(wildcard *.html)
+ 
+ EXTRA_DIST = \
+       $(BUILT_SOURCES) \
 --- 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 @@
@@ -20,3 +41,14 @@
  SUFFIXES = .html
  
  DEPENDENCIES = \
+diff -Nur w3c-libwww-5.4.0.orig/Library/src/Makefile.am w3c-libwww-5.4.0/Library/src/Makefile.am
+--- w3c-libwww-5.4.0.orig/Library/src/Makefile.am      2009-09-02 07:56:48.000000000 +0200
++++ w3c-libwww-5.4.0/Library/src/Makefile.am   2009-09-02 07:57:43.000000000 +0200
+@@ -440,7 +440,6 @@
+       HTBInit.h \
+       HTBTree.h \
+       HTBind.h \
+-      HTBind.h \
+       HTBound.h \
+       HTBufWrt.h \
+       HTCache.h \

diff --git a/w3c-libwww.spec b/w3c-libwww.spec
index 9f11dab61842d3dbde48db03adbe49ed5d4148d3..4de148400aaf29072c7cfe64a07d7eb576b0a6fb 100644 (file)
--- a/w3c-libwww.spec
+++ b/w3c-libwww.spec
@@ -11,12 +11,11 @@ Group:              Libraries
 Source0:       http://www.w3.org/Library/Distribution/%{name}-%{version}.tgz
 # Source0-md5: c3734ca6caa405707e134cc8c6d7e422
 Patch0:                %{name}-ac25x.patch
-Patch1:                %{name}-am15.patch
-Patch2:                %{name}-system-expat.patch
-Patch3:                %{name}-amfix.patch
-Patch4:                %{name}-link.patch
-Patch5:                %{name}-system-libmd5.patch
-Patch6:                %{name}-ssl.patch
+Patch1:                %{name}-system-expat.patch
+Patch2:                %{name}-amfix.patch
+Patch3:                %{name}-link.patch
+Patch4:                %{name}-system-libmd5.patch
+Patch5:                %{name}-ssl.patch
 URL:           http://www.w3.org/Library/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -186,7 +185,6 @@ POST, etc.).
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -207,7 +205,7 @@ POST, etc.).
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean