Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sc8-pr-cvs17:/tmp/cvs-serv10184/libs
Modified Files:
libxml2.info
Added Files:
libxml2-py.info libxml2-py.patch
Log Message:
move to stable
Index: libxml2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libxml2.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libxml2.info 7 Nov 2006 19:07:55 -0000 1.5
+++ libxml2.info 31 Jul 2007 17:26:50 -0000 1.6
@@ -1,97 +1,99 @@
Package: libxml2
-Version: 2.6.26
+Version: 2.6.27
Revision: 1001
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r)
-BuildDepends: libiconv-dev, readline5 (>= 5.0-1004), libncurses5 (>=
5.4-20041023-1006)
+Depends: %N-bin (= %v-%r), %N-shlibs (= %v-%r)
+BuildDepends: libiconv-dev, libncurses5 (>= 5.4-20041023-1006), readline5 (>=
5.0-1004)
Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
-Source-MD5: ce342b4d7b6d83e10cfa4d3f82bf75fd
+Source-MD5: 3617f7dc07534025a4898f2b62fb46df
PatchScript: <<
- sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
- perl -pi -e 's|/etc|%p/etc|g' catalog.c doc/catalog.html doc/guidelines.html
doc/xml.html doc/xmlcatalog.1 doc/xmlcatalog_man.html doc/xmlcatalog_man.xml
doc/xmllint.1 doc/xmllint.html runtest.c xmlcatalog.c doc/xmllint.xml
- perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
+ sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+ perl -pi -e 's|/etc|%p/etc|g' catalog.c doc/catalog.html
doc/guidelines.html doc/xml.html doc/xmlcatalog.1 doc/xmlcatalog_man.html
doc/xmlcatalog_man.xml doc/xmllint.1 doc/xmllint.html runtest.c xmlcatalog.c
doc/xmllint.xml
+ perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
<<
SetLDFLAGS: -no-undefined
ConfigureParams: --mandir=%p/share/man --with-iconv=%p --without-python
--disable-dependency-tracking --with-html-dir=%p/share/doc
--with-html-subdir=%n --with-history
CompileScript: <<
- ## Work around a missing xhtml-dtd in catalog
- ## which obviously cannot be in
- ## and xmllint --nonet to rebuild the doc which
- ## makes vanish index.html
- cp doc/index.html doc/index1.html
- XMLLINT=/usr/bin/true XSLTPROC=/usr/bin/true ./configure %c
- make
- rm -f doc/index.html
- mv doc/index1.html doc/index.html
+ ## Work around a missing xhtml-dtd in catalog
+ ## which obviously cannot be in
+ ## and xmllint --nonet to rebuild the doc which
+ ## makes vanish index.html
+ cp doc/index.html doc/index1.html
+ XMLLINT=/usr/bin/true XSLTPROC=/usr/bin/true ./configure %c
+ make
+ rm -f doc/index.html
+ mv doc/index1.html doc/index.html
<<
InstallScript: <<
- make install DESTDIR=%d DOC_MODULE=%n
- mkdir -p %i/etc/xml/catalog.d
- mkdir -p %i/etc/sgml/catalog.d
- mkdir -p %i/sbin
- install -c -m 755 update-xml-catalog %i/sbin/
- install -c -m 755 update-sgml-catalog %i/sbin/
+ make install DESTDIR=%d DOC_MODULE=%n
+ mkdir -p %i/etc/xml/catalog.d
+ mkdir -p %i/etc/sgml/catalog.d
+ mkdir -p %i/sbin
+ install -c -m 755 update-xml-catalog %i/sbin/
+ install -c -m 755 update-sgml-catalog %i/sbin/
<<
DocFiles: AUTHORS ChangeLog COPYING Copyright NEWS README TODO TODO_SCHEMAS
BuildDependsOnly: True
SplitOff: <<
- Package: %N-shlibs
- Depends: libiconv
- Replaces: libxml2 (<< 2.4.18-2)
- Suggests: %N-bin
- Files: lib/libxml2.%v.dylib lib/libxml2.2.dylib
- Shlibs: %p/lib/libxml2.2.dylib 9.0.0 %n (>= 2.6.1-1)
- DocFiles: Copyright README
+ Package: %N-shlibs
+ Depends: libiconv
+ Replaces: libxml2 (<< 2.4.18-2)
+ Suggests: %N-bin
+ Files: lib/libxml2.%v.dylib lib/libxml2.2.dylib
+ Shlibs: %p/lib/libxml2.2.dylib 9.0.0 %n (>= 2.6.1-1)
+ DocFiles: Copyright README
<<
SplitOff2: <<
- Package: %N-bin
- Depends: %N-shlibs (>= %v-%r), readline5-shlibs (>= 5.0-1004),
libncurses5-shlibs (>= 5.4-20041023-1006)
- Replaces: libxml2 (<< 2.4.18-2)
- Files: bin/xmlcatalog bin/xmllint sbin share/man/man1/xmlcatalog.1
share/man/man1/xmllint.1 etc/xml
- DocFiles: Copyright README
- RuntimeVars: <<
- SGML_CATALOG_FILES: %p/etc/sgml/catalog
- XML_CATALOG_FILES: %p/etc/xml/catalog
- <<
- PostInstScript: <<
- case "$1" in
- configure)
- update-xml-catalog
- update-sgml-catalog
- ;;
- esac
- <<
- PostRmScript: <<
- case "$1" in
- abort-install|purge|remove)
- rm -f %p/etc/xml/catalog
- rm -f %p/etc/sgml/catalog
- ;;
- esac
- <<
+ Package: %N-bin
+ Depends: %N-shlibs (>= %v-%r), libncurses5-shlibs (>=
5.4-20041023-1006), readline5-shlibs (>= 5.0-1004)
+ Replaces: libxml2 (<< 2.4.18-2)
+ Files: bin/xmlcatalog bin/xmllint sbin share/man/man1/xmlcatalog.1
share/man/man1/xmllint.1 etc/xml
+ DocFiles: Copyright README
+ RuntimeVars: <<
+ SGML_CATALOG_FILES: %p/etc/sgml/catalog
+ XML_CATALOG_FILES: %p/etc/xml/catalog
+ <<
+ PostInstScript: <<
+ case "$1" in
+ configure)
+ export SGML_CATALOG_FILES=%p/etc/sgml/catalog
+ export XML_CATALOG_FILES=%p/etc/xml/catalog
+ %p/sbin/update-xml-catalog
+ %p/sbin/update-sgml-catalog
+ ;;
+ esac
+ <<
+ PostRmScript: <<
+ case "$1" in
+ abort-install|purge|remove)
+ rm -f %p/etc/xml/catalog
+ rm -f %p/etc/sgml/catalog
+ ;;
+ esac
+ <<
<<
Description: XML parsing library, version 2
DescDetail: <<
- This set of packages does *not* contain the python bindings. Those
- are in libxml2-pyXX for various pythonX.X versions.
+ This set of packages does *not* contain the python bindings. Those
+ are in libxml2-pyXX for various pythonX.X versions.
<<
DescPort: <<
- Hide xmllint and xsltproc executables from ./configure to avoid
- circular dependencies (on libxml2-bin (build here) and libxslt-bin
- (depends on libxml2)) and network access during build. Fortunately,
- these executables are only used to build docs that already come
- prebuilt (we patch the targets instead of patching sources and
- rebuilding).
+ Hide xmllint and xsltproc executables from ./configure to avoid
+ circular dependencies (on libxml2-bin (build here) and libxslt-bin
+ (depends on libxml2)) and network access during build. Fortunately,
+ these executables are only used to build docs that already come
+ prebuilt (we patch the targets instead of patching sources and
+ rebuilding).
- Packages prior to 2.6.22-1 did not use --with-history, so they did
- not need readline or ncurses. Now it does, but these libs are only
- used for the -bin programs not the -shlibs libs. So no new flags in
- .la or .pc, so no dependency and rebuilding nightmare for dependent
- packages. Hooray!
+ Packages prior to 2.6.22-1 did not use --with-history, so they did
+ not need readline or ncurses. Now it does, but these libs are only
+ used for the -bin programs not the -shlibs libs. So no new flags in
+ .la or .pc, so no dependency and rebuilding nightmare for dependent
+ packages. Hooray!
- Rebuild the doc/examples/index.html not present in the tarball
- Changed the installation to avoid examples overriding top level
- of doc.
+ Rebuild the doc/examples/index.html not present in the tarball
+ Changed the installation to avoid examples overriding top level
+ of doc.
<<
DescPackaging: <<
Uses pkgconfig, but there are no pkgconfig-related dependencies.
--- NEW FILE: libxml2-py.patch ---
diff -Nurd -x'*~' libxml2-2.6.27.orig/python/Makefile.in
libxml2-2.6.27/python/Makefile.in
--- libxml2-2.6.27.orig/python/Makefile.in 2006-10-25 11:56:46.000000000
-0400
+++ libxml2-2.6.27/python/Makefile.in 2007-07-25 00:51:55.000000000 -0400
@@ -57,13 +57,12 @@
pythonLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(python_LTLIBRARIES)
@[EMAIL PROTECTED] = $(top_builddir)/libxml2.la
[EMAIL PROTECTED]@libxml2mod_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c
@[EMAIL PROTECTED] = libxml.lo types.lo \
@WITH_PYTHON_TRUE@ libxml2-py.lo
libxml2mod_la_OBJECTS = $(am_libxml2mod_la_OBJECTS)
@[EMAIL PROTECTED] = -rpath $(pythondir)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -305,8 +304,6 @@
SUBDIRS = . tests
INCLUDES = \
-I$(PYTHON_INCLUDES) \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/include \
-I$(top_builddir)/$(subdir)
DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
@@ -326,7 +323,7 @@
libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module
-avoid-version
@[EMAIL PROTECTED] = \
[EMAIL PROTECTED]@ $(top_builddir)/libxml2.la
[EMAIL PROTECTED]@ -lxml2
@[EMAIL PROTECTED] = libxml2mod.la
@[EMAIL PROTECTED] = libxml.c types.c libxml2-py.c
@@ -735,6 +732,7 @@
@WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pythondir)
@WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir)
@WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py
$(DESTDIR)$(pythondir)
[EMAIL PROTECTED]@ $(PYTHON)
$(prefix)/lib/python$(PYTHON_VERSION)/compileall.py -d $(pythondir)
$(DESTDIR)$(pythondir)
@WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
@WITH_PYTHON_TRUE@ @(for doc in $(DOCS) ; \
@WITH_PYTHON_TRUE@ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ;
done)
diff -Nurd -x'*~' libxml2-2.6.27.orig/python/setup.py
libxml2-2.6.27/python/setup.py
--- libxml2-2.6.27.orig/python/setup.py 2006-10-25 11:57:19.000000000 -0400
+++ libxml2-2.6.27/python/setup.py 2007-02-01 00:13:18.000000000 -0500
@@ -231,7 +231,7 @@
author = "Daniel Veillard",
author_email = "[EMAIL PROTECTED]",
url = "http://xmlsoft.org/python.html";,
- licence="MIT Licence",
+ license="MIT Licence",
py_modules=modules,
ext_modules=extens,
ext_package=ext_package,
diff -Nurd -x'*~' libxml2-2.6.27.orig/python/tests/Makefile.in
libxml2-2.6.27/python/tests/Makefile.in
--- libxml2-2.6.27.orig/python/tests/Makefile.in 2006-10-25
11:56:47.000000000 -0400
+++ libxml2-2.6.27/python/tests/Makefile.in 2007-02-01 00:15:27.000000000
-0500
@@ -476,14 +476,21 @@
@[EMAIL PROTECTED]: $(PYTESTS)
@WITH_PYTHON_TRUE@ @echo "## running Python regression tests"
[EMAIL PROTECTED]@ [EMAIL PROTECTED] -f test.out
@WITH_PYTHON_TRUE@ -@(PYTHONPATH="..:../.libs:$(srcdir)/..:$$PYTHONPATH" ;
\
@WITH_PYTHON_TRUE@ export PYTHONPATH; \
[EMAIL PROTECTED]@
LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
[EMAIL PROTECTED]@ export LD_LIBRARY_PATH; \
@WITH_PYTHON_TRUE@ for test in $(PYTESTS) ; \
[EMAIL PROTECTED]@ do log=`$(PYTHON) $(srcdir)/$$test` ; \
[EMAIL PROTECTED]@ do log=`$(PYTHON) $(srcdir)/$$test 2>&1` ; \
@WITH_PYTHON_TRUE@ if [ "`echo $$log | grep OK`" = "" ] ; then \
[EMAIL PROTECTED]@ echo "-- $$test" ; echo "$$log" ; fi ; done)
[EMAIL PROTECTED]@ echo "-- FAILED $$test" ; \
[EMAIL PROTECTED]@ echo "$$log" ; \
[EMAIL PROTECTED]@ echo " $$test" >> test.out ; \
[EMAIL PROTECTED]@ else \
[EMAIL PROTECTED]@ echo "-- OK $$test" ; \
[EMAIL PROTECTED]@ fi ; \
[EMAIL PROTECTED]@ done; \
[EMAIL PROTECTED]@ )
[EMAIL PROTECTED]@ @[ ! -s test.out ]
@[EMAIL PROTECTED]:
clean:
--- NEW FILE: libxml2-py.info ---
Info2: <<
Package: libxml2-py%type_pkg[python]
Version: 2.6.27
Revision: 1002
Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
Type: python (2.3 2.4 2.5)
Depends: libxml2-shlibs (>= %v-1), libiconv, python%type_pkg[python]
BuildDepends: libxml2 (>= %v-1), libiconv-dev, readline5 (>= 5.0-1004),
libncurses5 (>= 5.4-20041023-1006)
Source: mirror:gnome:sources/libxml2/2.6/libxml2-%v.tar.bz2
Source-MD5: 3617f7dc07534025a4898f2b62fb46df
Patch: %{ni}.patch
PatchScript: <<
perl -pi -e 's/MAKEFLAGS\+=--silent//' `find . -name Makefile.in`
<<
SetCPPFLAGS: -I%p/include/libxml2
ConfigureParams: --mandir=%p/share/man --with-iconv=%p
--with-python=%p/bin/python%type_raw[python] --disable-static
--disable-dependency-tracking --with-html-dir=%p/share/doc
--with-html-subdir=%n --with-history
CompileScript: <<
./configure %c
make -C python
make -C python tests
<<
InstallScript: <<
make -C python install DESTDIR=%d DOCS_DIR=%p/share/doc/%n
EXAMPLE_DIR=%p/share/doc/%n/examples
<<
DocFiles: AUTHORS Copyright NEWS README python/README:README.py-bindings TODO
python/TODO:TODO.py-bindings
Description: Python bindings for libxml2 library
DescPackaging: <<
Patch python module makefiles to use installed libxml2 not locally-built
See: http://bugzilla.gnome.org/show_bug.cgi?id=341290
<<
DescPort: <<
Fix tests target so that it gives cleaner feedback and propagates
failures correctly to the caller's shell.
Uses deprecated xmllib instead of xml.sax. See:
http://bugzilla.gnome.org/show_bug.cgi?id=340764
Patch python/Makefile.in to compile .py -> .pyc for 'make install'.
See: http://bugzilla.gnome.org/show_bug.cgi?id=460113
<<
License: LGPL
Homepage: http://www.xmlsoft.org/
<<
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
