rebase "add packaging" ~ "Bump to version 2.9.2"

Change-Id: Ia0a2d3d8c18cfaa3eba18a1161f7f4c7407c5e04
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
new file mode 100644 (file)
index 0000000..b3d6bf8
--- /dev/null
+++ b/packaging/baselibs.conf
@@ -0,0 +1,3 @@
+libxml2
+libxml2-devel
+    requires "libxml2-<targettype> = <version>"

diff --git a/packaging/libxml2.changes b/packaging/libxml2.changes
new file mode 100644 (file)
index 0000000..c47f013
--- /dev/null
+++ b/packaging/libxml2.changes
@@ -0,0 +1,3 @@
+* Mon Mar 18 2013 Anas Nashif <anas.nashif@intel.com> upstream/2.8.0@a14fbb2
+- Fixed package groups
+

diff --git a/packaging/libxml2.manifest b/packaging/libxml2.manifest
new file mode 100644 (file)
index 0000000..dca4d98
--- /dev/null
+++ b/packaging/libxml2.manifest
@@ -0,0 +1,8 @@
+<manifest>
+       <assign>
+               <filesystem path="/usr/bin/*" exec_label="none"/>
+       </assign>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/libxml2.spec b/packaging/libxml2.spec
new file mode 100644 (file)
index 0000000..dd463d2
--- /dev/null
+++ b/packaging/libxml2.spec
@@ -0,0 +1,118 @@
+Name:           libxml2
+Version:        2.9.2
+Release:        0
+Summary:        A Library to Manipulate XML Files
+License:        MIT
+Group:          System/Libraries
+Url:            http://xmlsoft.org
+# Source ftp://xmlsoft.org/libxml2/libxml2-git-snapshot.tar.gz changes every day
+Source:         ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
+Source2:        baselibs.conf
+Source1001:    libxml2.manifest
+BuildRequires:  pkg-config
+BuildRequires:  readline-devel
+BuildRequires:  xz-devel
+BuildRequires:  zlib-devel
+
+%description
+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
+
+%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
+Requires:       %{name} = %{version}
+Requires:       %{name}-tools = %{version}
+Requires:       glibc-devel
+Requires:       readline-devel
+Requires:       xz-devel
+Requires:       zlib-devel
+
+%description devel
+This package contains all necessary include files and libraries needed
+to develop applications that require these.
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+%configure --disable-static \
+    --docdir=%_docdir/%name \
+    --with-html-dir=%_docdir/%name/html \
+    --with-fexceptions \
+    --with-history \
+    --without-python \
+    --enable-ipv6 \
+    --with-sax1 \
+    --with-regexps \
+    --with-threads \
+    --with-reader \
+    --with-http
+
+make %{?_smp_mflags} BASE_DIR="%_docdir" DOC_MODULE="%name"
+
+%check
+# qemu-arm can't keep up atm, disabling check for arm
+%ifnarch %arm
+make check
+%endif
+
+%install
+make install DESTDIR="%buildroot" BASE_DIR="%_docdir" DOC_MODULE="%name"
+ln -s libxml2/libxml %{buildroot}%{_includedir}/libxml
+
+%remove_docs
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files 
+%manifest %{name}.manifest
+%defattr(-, root, root)
+%license COPYING*
+%{_libdir}/lib*.so.*
+
+%files tools
+%manifest %{name}.manifest
+%defattr(-, root, root)
+%{_bindir}/xmllint
+%{_bindir}/xmlcatalog
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-, root, root)
+%{_bindir}/xml2-config
+%dir %{_datadir}/aclocal
+%{_datadir}/aclocal/libxml.m4
+%{_includedir}/libxml
+%{_includedir}/libxml2
+%{_libdir}/lib*.so
+# libxml2.la is needed for the python-libxml2 build. Deleting it breaks build of python-libxml2.
+%{_libdir}/libxml2.la
+%{_libdir}/*.sh
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/cmake/libxml2/libxml2-config.cmake
+
+%changelog

diff --git a/packaging/python-libxml2.spec b/packaging/python-libxml2.spec
new file mode 100644 (file)
index 0000000..6825dec
--- /dev/null
+++ b/packaging/python-libxml2.spec
@@ -0,0 +1,65 @@
+Name:           python-libxml2
+Version:        2.9.2
+Release:        0
+Summary:        Python Bindings for libxml2
+License:        MIT
+Group:          Development/Python
+Url:            http://xmlsoft.org
+Source:         ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  libxml2-devel
+BuildRequires:  python-devel
+BuildRequires:  python-xml
+Requires:       libxml2 = %{version}
+Obsoletes:      libxml2-python < %{version}
+Provides:       libxml2-python = %{version}
+
+%description
+The libxml2-python package contains a module that permits applications
+written in the Python programming language to use the interface
+supplied by the libxml2 library to manipulate XML files.
+
+This library allows manipulation of XML files. It includes support for
+reading, modifying, and writing XML and HTML files. There is DTD
+support that includes parsing and validation even with complex DTDs,
+either at parse time or later once the document has been modified.
+
+%prep
+%setup -q -n libxml2-%{version}
+
+%build
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%configure \
+    --with-fexceptions \
+    --with-history \
+    --enable-ipv6 \
+    --with-sax1 \
+    --with-regexps \
+    --with-threads \
+    --with-reader \
+    --with-http
+
+# use libxml2 as built by libxml2 source package
+mkdir .libs
+cp -v %{_libdir}/libxml2.la .
+make -C python %{?_smp_mflags}
+
+%install
+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*
+# #223696
+rm -f %{buildroot}%{py_sitedir}/*.{la,a}
+
+%files
+%defattr(-, root, root)
+%doc python/libxml2class.txt
+%doc python/tests
+%{py_sitedir}/*
+
+%changelog

diff --git a/result/namespaces/err_7.xml b/result/namespaces/err_7.xml
index 4b4c662..f4e5164 100644 (file)
--- a/result/namespaces/err_7.xml
+++ b/result/namespaces/err_7.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<f:foo/>
+<foo/>

diff --git a/result/xmlid/id_tst2.xml b/result/xmlid/id_tst2.xml
index 856a320..33ee896 100644 (file)
--- a/result/xmlid/id_tst2.xml
+++ b/result/xmlid/id_tst2.xml
@@ -1,6 +1,6 @@
 Object is a Node Set :
 Set contains 1 nodes:
-1  ELEMENT n:foo
+1  ELEMENT foo
     ATTRIBUTE id
       TEXT
         content=bar

diff --git a/result/xmlid/id_tst3.xml b/result/xmlid/id_tst3.xml
index 6d8865c..e2f8228 100644 (file)
--- a/result/xmlid/id_tst3.xml
+++ b/result/xmlid/id_tst3.xml
@@ -1,6 +1,6 @@
 Object is a Node Set :
 Set contains 1 nodes:
-1  ELEMENT f:o:o
+1  ELEMENT o:o
     ATTRIBUTE id
       TEXT
         content=bar