Author: tommat Date: Wed Sep 2 06:29:01 2009 GMT Module: packages Tag: HEAD ---- Log message: - integrated automake fixes
---- Files affected: packages/w3c-libwww: w3c-libwww.spec (1.54 -> 1.55) , w3c-libwww-amfix.patch (1.1 -> 1.2) , w3c-libwww-am15.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/w3c-libwww/w3c-libwww.spec diff -u packages/w3c-libwww/w3c-libwww.spec:1.54 packages/w3c-libwww/w3c-libwww.spec:1.55 --- packages/w3c-libwww/w3c-libwww.spec:1.54 Fri Sep 19 15:12:21 2008 +++ packages/w3c-libwww/w3c-libwww.spec Wed Sep 2 08:28:55 2009 @@ -12,12 +12,11 @@ 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 @@ -187,7 +186,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %build %{__libtoolize} @@ -208,7 +206,7 @@ %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +%{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT %clean @@ -253,6 +251,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.55 2009/09/02 06:28:55 tommat +- integrated automake fixes + Revision 1.54 2008/09/19 13:12:21 pluto - put @LWWWSSL@ in `libwww-config --libs` and fix xmlrpc-client unresolved HTSSL* symbols. - release 11. ================================================================ Index: packages/w3c-libwww/w3c-libwww-amfix.patch diff -u packages/w3c-libwww/w3c-libwww-amfix.patch:1.1 packages/w3c-libwww/w3c-libwww-amfix.patch:1.2 --- packages/w3c-libwww/w3c-libwww-amfix.patch:1.1 Thu Oct 23 19:13:58 2003 +++ packages/w3c-libwww/w3c-libwww-amfix.patch Wed Sep 2 08:28:55 2009 @@ -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 \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/w3c-libwww/w3c-libwww.spec?r1=1.54&r2=1.55&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/w3c-libwww/w3c-libwww-amfix.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
