OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Jun-2008 14:21:37
Branch: HEAD Handle: 2008061513213700
Modified files:
openpkg-src/libxml libxml.patch libxml.spec
Log:
cleanup packaging
Summary:
Revision Changes Path
1.7 +7 -7 openpkg-src/libxml/libxml.patch
1.120 +7 -6 openpkg-src/libxml/libxml.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libxml/libxml.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 libxml.patch
--- openpkg-src/libxml/libxml.patch 10 Dec 2003 20:45:51 -0000 1.6
+++ openpkg-src/libxml/libxml.patch 15 Jun 2008 12:21:37 -0000 1.7
@@ -1,7 +1,7 @@
Index: nanoftp.c
---- nanoftp.c.orig 2003-10-29 14:27:37.000000000 +0100
-+++ nanoftp.c 2003-12-10 21:09:52.000000000 +0100
-@@ -1553,7 +1553,7 @@
+--- nanoftp.c.orig 2007-04-17 14:43:53 +0200
++++ nanoftp.c 2008-06-15 14:15:08 +0200
+@@ -1381,7 +1381,7 @@
memset (&dataAddr, 0, sizeof(dataAddr));
#ifdef SUPPORT_IP6
@@ -10,7 +10,7 @@
ctxt->dataFd = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
((struct sockaddr_in6 *)&dataAddr)->sin6_family = AF_INET6;
dataAddrLen = sizeof(struct sockaddr_in6);
-@@ -1572,7 +1572,7 @@
+@@ -1400,7 +1400,7 @@
if (ctxt->passive) {
#ifdef SUPPORT_IP6
@@ -19,7 +19,7 @@
snprintf (buf, sizeof(buf), "EPSV\r\n");
else
#endif
-@@ -1603,7 +1603,7 @@
+@@ -1431,7 +1431,7 @@
cur = &ctxt->controlBuf[ctxt->controlBufAnswer];
while (((*cur < '0') || (*cur > '9')) && *cur != '\0') cur++;
#ifdef SUPPORT_IP6
@@ -28,7 +28,7 @@
if (sscanf (cur, "%u", &temp[0]) != 1) {
__xmlIOErr(XML_FROM_FTP, XML_FTP_EPSV_ANSWER,
"Invalid answer to EPSV\n");
-@@ -1640,7 +1640,7 @@
+@@ -1468,7 +1468,7 @@
} else {
getsockname(ctxt->dataFd, (struct sockaddr *) &dataAddr,
&dataAddrLen);
#ifdef SUPPORT_IP6
@@ -37,7 +37,7 @@
((struct sockaddr_in6 *)&dataAddr)->sin6_port = 0;
else
#endif
-@@ -1659,7 +1659,7 @@
+@@ -1487,7 +1487,7 @@
return (-1);
}
#ifdef SUPPORT_IP6
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libxml/libxml.spec
============================================================================
$ cvs diff -u -r1.119 -r1.120 libxml.spec
--- openpkg-src/libxml/libxml.spec 9 Apr 2008 09:04:57 -0000 1.119
+++ openpkg-src/libxml/libxml.spec 15 Jun 2008 12:21:37 -0000 1.120
@@ -32,7 +32,7 @@
Group: XML
License: MIT-style
Version: 2.6.32
-Release: 20080409
+Release: 20080615
# list of sources
Source0: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
@@ -41,8 +41,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, zlib, libiconv, make
-PreReq: OpenPKG, openpkg >= 20040130, zlib, libiconv
+BuildPreReq: OpenPKG, openpkg >= 20040130, make
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: zlib, libiconv
+PreReq: zlib, libiconv
AutoReq: no
AutoReqProv: no
@@ -79,8 +81,8 @@
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
--with-iconv=%{l_prefix} \
+ --with-zlib=%{l_prefix} \
--disable-shared \
- --disable-corba \
--without-threads \
--without-python
%{l_make} %{l_mflags -O}
@@ -91,8 +93,7 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
- %{l_files_std}
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
