From 3a7abef0cfbd0ef1a1cdd8fd7365ae5849bf04354e2d1e7660b52d6ac77a2df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 23 Feb 2012 12:37:52 +0000 Subject: [PATCH] Accepting request 106624 from home:coolo:branches:openSUSE:Factory - update to today's GIT snapshot: include XZ support - split libxml2-2 according to shared library policy - renamed to python-libxml2 to follow python naming expectations - do not require python but let rpm figure it out - Remove redundant tags/sections - update to libxml-2.7.8+git20110708 - several important bugfixes - buildrequire python-xml to fix build - update to libxml-2.7.8 - number of bufixes, documentation and portability fixes - update language ID parser to RFC 5646 - sort python generated stubs - add an HTML parser option to avoid a default doctype - see http://xmlsoft.org/news.html for exact details - clean up specfile - fix build - update to 2.7.7 - add extra options to ./configure for scribus features and avoid a crash - updates from 2.7.3 > 2.7.7 include a number of portability, correctness memory leaks and build fixes including some CVE - see http://xmlsoft.org/news.html for exact details OBS-URL: https://build.opensuse.org/request/show/106624 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxml2?expand=0&rev=46 --- baselibs.conf | 4 +- libxml2-2.7.8+git20110708.tar.bz2 | 3 - libxml2-git-snapshot.tar.gz | 3 + libxml2-python-rpmlintrc | 1 - libxml2.changes | 7 +++ libxml2.spec | 60 +++++++++++++------ ...2-python.changes => python-libxml2.changes | 6 ++ libxml2-python.spec => python-libxml2.spec | 20 +++---- 8 files changed, 72 insertions(+), 32 deletions(-) delete mode 100644 libxml2-2.7.8+git20110708.tar.bz2 create mode 100644 libxml2-git-snapshot.tar.gz delete mode 100644 libxml2-python-rpmlintrc rename libxml2-python.changes => python-libxml2.changes (99%) rename libxml2-python.spec => python-libxml2.spec (84%) diff --git a/baselibs.conf b/baselibs.conf index a8e3538..f4d5ff2 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ -libxml2 +libxml2-2 libxml2-devel + requires -libxml2- + requires "libxml2-2- = " diff --git a/libxml2-2.7.8+git20110708.tar.bz2 b/libxml2-2.7.8+git20110708.tar.bz2 deleted file mode 100644 index 4ae2488..0000000 --- a/libxml2-2.7.8+git20110708.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7005c74ad64c86921ee6879b01cec7c4cbbc47bd2645ab38491a86fba594521d -size 4886784 diff --git a/libxml2-git-snapshot.tar.gz b/libxml2-git-snapshot.tar.gz new file mode 100644 index 0000000..3a61bed --- /dev/null +++ b/libxml2-git-snapshot.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62acf06e9acfb912cc2f09ef77ec104812175f8f81715732ae40afec7beb99f7 +size 4896896 diff --git a/libxml2-python-rpmlintrc b/libxml2-python-rpmlintrc deleted file mode 100644 index 907dc25..0000000 --- a/libxml2-python-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("spurious-executable-perm .*/usr/share/doc/packages/libxml2-python/tests/.*") diff --git a/libxml2.changes b/libxml2.changes index 9a04f52..c6b69c9 100644 --- a/libxml2.changes +++ b/libxml2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 23 10:42:16 UTC 2012 - coolo@suse.com + +- update to today's GIT snapshot: + include XZ support +- split libxml2-2 according to shared library policy + ------------------------------------------------------------------- Mon Dec 26 17:08:52 UTC 2011 - jengelh@medozas.de diff --git a/libxml2.spec b/libxml2.spec index 90bf939..a2e6c35 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,7 +1,7 @@ # # spec file for package libxml2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,22 @@ # +%define lname libxml2-2 Name: libxml2 -Version: 2.7.8+git20110708 +Version: 2.7.8+git20120223 Release: 0 Summary: A Library to Manipulate XML Files License: MIT Group: System/Libraries -URL: http://xmlsoft.org -Source: %{name}-%{version}.tar.bz2 +Url: http://xmlsoft.org +Source: ftp://xmlsoft.org/libxml2/libxml2-git-snapshot.tar.gz Source2: baselibs.conf -BuildRequires: autoconf BuildRequires: pkg-config BuildRequires: readline-devel +BuildRequires: xz-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# bug437293 -%ifarch ppc64 -Obsoletes: libxml2-64bit -%endif %description The XML C library was initially developed for the GNOME project. It is @@ -52,13 +49,42 @@ implement them: DOM, FTP client, HTTP client, and SAX. The library also supports RelaxNG. Support for W3C XML Schemas is in progress. +%package -n %lname +Summary: A Library to Manipulate XML Files +Group: System/Libraries + +%description -n %lname +The XML C library was initially developed for the GNOME project. It is +now used by many programs to load and save extensible data structures +or manipulate any kind of XML files. + +This library implements a number of existing standards related to +markup languages, including the XML standard, name spaces in XML, XML +Base, RFC 2396, XPath, XPointer, HTML4, XInclude, SGML catalogs, and +XML catalogs. In most cases, libxml tries to implement the +specification in a rather strict way. To some extent, it provides +support for the following specifications, but does not claim to +implement them: DOM, FTP client, HTTP client, and SAX. + +The library also supports RelaxNG. Support for W3C XML Schemas is in +progress. + +%package tools +Summary: Tools using libxml +Group: System/Libraries +Provides: %name:/usr/bin/xmllint + +%description tools +This package contains xmllint, a very useful tool proving libxml's power. + %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{lname} = %{version} Requires: glibc-devel Requires: readline-devel Requires: zlib-devel +Requires: xz-devel # bug437293 %ifarch ppc64 Obsoletes: libxml2-devel-64bit @@ -96,9 +122,6 @@ progress. %setup -q -n %{name}-2.7.8 %build -# needed with patch3 - until it is no longer required -%__autoconf - %configure --disable-static \ --with-html-subdir=packages/%{name}/html \ --with-fexceptions \ @@ -124,17 +147,20 @@ ln -s libxml2/libxml %{buildroot}%{_includedir}/libxml make check %endif -%post -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files +%files -n %lname %defattr(-, root, root) +%{_libdir}/lib*.so.* %doc %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/[ANRCT]* + +%files tools +%defattr(-, root, root) %{_bindir}/xmllint %{_bindir}/xmlcatalog -%{_libdir}/lib*.so.* %doc %{_mandir}/man1/xmllint.1* %doc %{_mandir}/man1/xmlcatalog.1* diff --git a/libxml2-python.changes b/python-libxml2.changes similarity index 99% rename from libxml2-python.changes rename to python-libxml2.changes index d035b2d..4a3d2fb 100644 --- a/libxml2-python.changes +++ b/python-libxml2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 23 11:00:21 UTC 2012 - coolo@suse.com + +- renamed to python-libxml2 to follow python naming expectations +- do not require python but let rpm figure it out + ------------------------------------------------------------------- Mon Dec 26 17:08:59 UTC 2011 - jengelh@medozas.de diff --git a/libxml2-python.spec b/python-libxml2.spec similarity index 84% rename from libxml2-python.spec rename to python-libxml2.spec index d78d7c7..520322a 100644 --- a/libxml2-python.spec +++ b/python-libxml2.spec @@ -1,7 +1,7 @@ # -# spec file for package libxml2-python +# spec file for package python-libxml2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,24 +16,23 @@ # - -Name: libxml2-python -Version: 2.7.8+git20110708 +Name: python-libxml2 +Version: 2.7.8+git20110223 Release: 0 Summary: Python Bindings for libxml2 License: MIT Group: Development/Libraries/Python -URL: http://xmlsoft.org -Source: libxml2-%{version}.tar.bz2 -Source1: libxml2-python-rpmlintrc +Url: http://xmlsoft.org +Source: ftp://xmlsoft.org/libxml2/libxml2-git-snapshot.tar.gz BuildRequires: libxml2-devel BuildRequires: python-devel BuildRequires: python-xml -%py_requires -Requires: libxml2 = %{version} +Requires: libxml2-2 = %{version} # Uncomment to save space: #NoSource: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: libxml2-python = %{version} +Obsoletes: libxml2-python < 2.7.8+git20110223 %description The libxml2-python package contains a module that permits applications @@ -74,6 +73,7 @@ make -C python install \ DESTDIR=%{buildroot} \ pythondir=%{py_sitedir} \ PYTHON_SITE_PACKAGES=%{py_sitedir} +chmod a-x python/tests/*.py # Unwanted doc stuff rm -fr %{buildroot}%{_datadir}/doc rm -f python/tests/Makefile*