rpms/w3c-libwww/devel w3c-libwww-5.4.1-incdir.patch, NONE, 1.1 w3c-libwww-makefile.patch, NONE, 1.1 w3c-libwww.spec, 1.10, 1.11
Debarshi Ray
rishi at fedoraproject.org
Sun Dec 14 20:56:10 UTC 2008
- Previous message (by thread): comps comps-f10.xml.in,1.188,1.189 comps-f11.xml.in,1.26,1.27
- Next message (by thread): comps comps-f10.xml.in, 1.189, 1.190 comps-f11.xml.in, 1.27, 1.28 comps-f7.xml.in, 1.336, 1.337 comps-f8.xml.in, 1.287, 1.288 comps-f9.xml.in, 1.423, 1.424
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rishi
Update of /cvs/pkgs/rpms/w3c-libwww/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14079
Modified Files:
w3c-libwww.spec
Added Files:
w3c-libwww-5.4.1-incdir.patch w3c-libwww-makefile.patch
Log Message:
* Wed Dec 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 5.4.1-0.12.20060206cvs
- Updated patches to fix FTBFS. Closes Red Hat Bugzilla bug #465034.
- Fixed linkage problems to reduce the number of undefined non-weak symbols.
- Omitted unused direct shared library dependencies.
w3c-libwww-5.4.1-incdir.patch:
--- NEW FILE w3c-libwww-5.4.1-incdir.patch ---
diff -urNp libwww.orig/libwww-config.in libwww/libwww-config.in
--- libwww.orig/libwww-config.in 2008-12-02 22:15:32.013554517 +0530
+++ libwww/libwww-config.in 2008-12-15 02:05:16.744796267 +0530
@@ -45,7 +45,11 @@ while test $# -gt 0; do
echo @VERSION@
;;
--cflags)
- echo -I at includedir@ -I at includedir@/@PACKAGE@ @DEFS@
+ if [ "@includedir@" != "@prefix@/include" ]; then
+ echo -I at includedir@ -I at includedir@/@PACKAGE@ @DEFS@
+ else
+ echo -I at includedir@/@PACKAGE@ @DEFS@
+ fi
;;
--libs)
echo -L at libdir@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp @LWWWXML@ -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LWWWSSL@ @LIBS@
w3c-libwww-makefile.patch:
--- NEW FILE w3c-libwww-makefile.patch ---
diff -urNp libwww.orig/Library/src/Makefile.am libwww/Library/src/Makefile.am
--- libwww.orig/Library/src/Makefile.am 2008-12-02 22:15:32.204557214 +0530
+++ libwww/Library/src/Makefile.am 2008-12-03 01:03:24.813805737 +0530
@@ -159,6 +159,8 @@ libwwwtrans_la_SOURCES = \
HTWriter.h \
HTWriter.c
+libwwwtrans_la_LIBADD = libwwwcore.la
+
libwwwstream_la_SOURCES = \
WWWStream.h \
HTConLen.h \
@@ -198,6 +200,8 @@ libwwwfile_la_SOURCES = \
HTMulti.h \
HTMulti.c
+libwwwfile_la_LIBADD = libwwwtrans.la
+
libwwwftp_la_SOURCES = \
WWWFTP.h \
HTFTP.h \
@@ -334,6 +338,22 @@ libwwwapp_la_SOURCES = \
HTRules.h \
HTRules.c
+libwwwapp_la_LIBADD = \
+ libwwwcache.la \
+ libwwwdir.la \
+ libwwwfile.la \
+ libwwwftp.la \
+ libwwwgopher.la \
+ libwwwhtml.la \
+ libwwwhttp.la \
+ libwwwmime.la \
+ libwwwnews.la \
+ libwwwstream.la \
+ libwwwtrans.la \
+ libwwwutils.la \
+ libwwwzip.la \
+ libwwwcore.la
+
libwwwinit_la_SOURCES = \
WWWInit.h \
HTProfil.h \
@@ -362,10 +382,7 @@ libwwwxml_la_SOURCES = \
HTXML.h \
HTXML.c
-libwwwxml_la_DEPENDENCIES = \
- ../../modules/expat/libexpat.la
-
-libwwwxml_la_LDFLAGS = -rpath $(libdir)
+libwwwxml_la_LDFLAGS = -lexpat -rpath $(libdir)
libwwwzip_la_SOURCES = \
WWWZip.h \
@@ -375,6 +392,10 @@ libwwwzip_la_SOURCES = \
libwwwzip_la_LDFLAGS = -rpath $(libdir)
+libwwwzip_la_LIBADD = \
+ libwwwutils.la \
+ libwwwcore.la
+
libwwwsql_la_SOURCES = \
WWWSQL.h \
HTSQL.h \
@@ -386,9 +407,8 @@ libwwwsql_la_SOURCES = \
libwwwsql_la_LDFLAGS = -rpath $(libdir)
INCLUDES = \
- -I/usr/local/include \
-I${top_srcdir}/modules/md5 \
- -I${top_srcdir}/modules/expat/lib
+ -I$(includedir)
BUILT_SOURCES = \
wwwsys.h \
diff -urNp libwww.orig/modules/Makefile.am libwww/modules/Makefile.am
--- libwww.orig/modules/Makefile.am 2008-12-02 22:15:34.510804238 +0530
+++ libwww/modules/Makefile.am 2008-12-02 22:58:08.916554618 +0530
@@ -5,5 +5,5 @@ DOCS := $(wildcard *.html *.gif)
EXTRA_DIST = \
$(DOCS)
-SUBDIRS = expat md5
+SUBDIRS = md5
Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-libwww/devel/w3c-libwww.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- w3c-libwww.spec 21 May 2008 20:47:59 -0000 1.10
+++ w3c-libwww.spec 14 Dec 2008 20:55:40 -0000 1.11
@@ -1,6 +1,6 @@
Name: w3c-libwww
Version: 5.4.1
-Release: 0.11.20060206cvs%{?dist}
+Release: 0.12.20060206cvs%{?dist}
Summary: HTTP library of common code
Group: System Environment/Libraries
@@ -12,11 +12,10 @@
#cvs -d :pserver:anonymous at dev.w3.org:/sources/public -z3 checkout libwww
Source: w3c-libwww-20060206.tar.bz2
Patch0: w3c-libwww-configure.patch
-Patch1: w3c-libwww-5.3.2-incdir.patch
+Patch1: w3c-libwww-5.4.1-incdir.patch
Patch2: w3c-libwww-ppc64.patch
Patch3: w3c-libwww-md5.patch
-#external expat
-Patch100: w3c-libwww-expat.patch
+Patch4: w3c-libwww-makefile.patch
Patch101: w3c-libwww-multiarch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool autoconf automake zlib-devel openssl-devel expat-devel
@@ -62,7 +61,7 @@
%patch1 -p1
%patch2 -p1 -b .ppc64
%patch3
-%patch100
+%patch4 -p1
%patch101
# we don't want the libwww version
@@ -80,6 +79,10 @@
%configure --enable-shared --disable-static --with-gnu-ld --with-regex \
--with-zlib --with-ssl --enable-reentrant
export tagname=CC
+
+# Omit unused direct shared library dependencies.
+sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
+
make %{?_smp_mflags}
%install
@@ -129,6 +132,11 @@
%{_includedir}/w3c-libwww
%changelog
+* Wed Dec 03 2008 Debarshi Ray <rishi at fedoraproject.org> - 5.4.1-0.12.20060206cvs
+- Updated patches to fix FTBFS. Closes Red Hat Bugzilla bug #465034.
+- Fixed linkage problems to reduce the number of undefined non-weak symbols.
+- Omitted unused direct shared library dependencies.
+
* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.4.1-0.11.20060206cvs
- fix license tag
- Previous message (by thread): comps comps-f10.xml.in,1.188,1.189 comps-f11.xml.in,1.26,1.27
- Next message (by thread): comps comps-f10.xml.in, 1.189, 1.190 comps-f11.xml.in, 1.27, 1.28 comps-f7.xml.in, 1.336, 1.337 comps-f8.xml.in, 1.287, 1.288 comps-f9.xml.in, 1.423, 1.424
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list