Rebase for libxslt-1.1.29

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

10 files changed, 126 insertions, 4 deletions

diff --git a/.gbs.conf b/.gbs.conf
new file mode 100644
index 00000000..2877865d
--- /dev/null
+++ b/.gbs.conf
@@ -0,0 +1,3 @@
+[general]
+upstream_branch = upstream/master
+upstream_tag = v${upstreamversion}
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
new file mode 100644
index 00000000..d30a95dd
--- /dev/null
+++ b/packaging/baselibs.conf
@@ -0,0 +1,2 @@
+libxslt
+libxslt-devel
diff --git a/packaging/libxslt.changes b/packaging/libxslt.changes
new file mode 100644
index 00000000..069d0d1c
--- /dev/null
+++ b/packaging/libxslt.changes
@@ -0,0 +1,6 @@
+* Sat May 11 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130509.181509@fac3ee9
+- Set license using %license
+
+* Wed Feb 20 2013 Anas Nashif <anas.nashif@intel.com> upstream/1.1.26@cda8996
+- Fixed baselibs to not require numbered sub-package
+
diff --git a/packaging/libxslt.manifest b/packaging/libxslt.manifest
new file mode 100644
index 00000000..017d22d3
--- /dev/null
+++ b/packaging/libxslt.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/libxslt.spec b/packaging/libxslt.spec
new file mode 100644
index 00000000..cec05ee8
--- /dev/null
+++ b/packaging/libxslt.spec
@@ -0,0 +1,106 @@
+Name:           libxslt
+Version:        1.1.28
+Release:        0
+Summary:        XSL Transformation Library
+License:        MIT and GPL-2.0+
+Group:          System/Libraries
+Url:            http://xmlsoft.org/XSLT/
+Source:         %{name}-%{version}.tar.bz2
+#X-Vcs-Url:     git://git.gnome.org/libxslt
+Source2:        baselibs.conf
+Source3:        xslt-config.1.gz
+Source1001:     libxslt.manifest
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libgpg-error-devel
+BuildRequires:  libtool
+BuildRequires:  libxml2-devel
+BuildRequires:  pkg-config
+
+%description
+This C library allows you to transform XML files into other XML files
+(or HTML, text, and more) using the standard XSLT stylesheet
+transformation mechanism.
+
+It is based on libxml (version 2) for XML parsing, tree manipulation,
+and XPath support. It is written in plain C, making as few assumptions
+as possible and sticks closely to ANSI C/POSIX for easy embedding.
+Although not primarily designed with performance in mind, libxslt seems
+to be a relatively fast processor. It also includes full support for
+the EXSLT set of extension functions as well as some common extensions
+present in other XSLT engines.
+
+
+%package devel
+Summary:        Include Files and Libraries mandatory for Development
+License:        LGPL-2.1+
+Group:          System/Libraries
+Requires:       %{name}-tools = %version
+Requires:       libxslt = %{version}
+Requires:       glibc-devel
+Requires:       libgcrypt-devel
+Requires:       libgpg-error-devel
+#libxml is automatically required with pkgconfig
+
+%description devel
+This package contains all necessary include files and libraries needed
+to develop applications that require these.
+
+%package tools
+Summary:        Extended Stylesheet Language (XSL) Transformation utilities
+License:        MIT and GPL-2.0+
+Group:          Development/Tools
+Provides:       xsltproc = %version-%release
+
+%description tools
+This package contains xsltproc, a command line interface to the XSLT engine.
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+%autogen --disable-static --with-pic --without-python
+%__make %{?_smp_mflags}
+
+%check
+%if ! 0%{?qemu_user_space_build}
+%__make check
+%endif
+
+%install
+%make_install
+
+# Unwanted doc stuff
+rm -fr %{buildroot}%{_datadir}/doc
+
+# the manual page is required
+install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}'
+
+
+%post -n libxslt -p /sbin/ldconfig
+
+%postun -n libxslt -p /sbin/ldconfig
+
+%files -n libxslt
+%manifest %{name}.manifest
+%defattr(-, root, root)
+%license COPYING Copyright
+%{_libdir}/lib*.so.*
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-, root, root)
+%{_libdir}/lib*.so
+%{_libdir}/*.sh
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
+%{_datadir}/aclocal/*
+%{_bindir}/xslt-config
+%doc %{_mandir}/man1/xslt-config.*
+%doc %{_mandir}/man3/*
+
+%files tools
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%{_bindir}/xsltproc
+%doc %{_mandir}/man1/xsltproc.*
diff --git a/packaging/xslt-config.1.gz b/packaging/xslt-config.1.gz
new file mode 100644
index 00000000..6d437750
--- /dev/null
+++ b/packaging/xslt-config.1.gz
diff --git a/python/Makefile.am b/python/Makefile.am
index fa58b78f..af8c639a 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST = 			\
 	libxslt-python-api.xml	\
 	$(DOCS)
 
-libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) $(mylibs) -module -avoid-version
 
 if WITH_PYTHON
 mylibs = \
diff --git a/xslt-config.in b/xslt-config.in
index 45c3e28f..93351e84 100644
--- a/xslt-config.in
+++ b/xslt-config.in
@@ -89,7 +89,7 @@ while test $# -gt 0; do
     shift
 done
 
-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
+the_libs="-lxslt"
 if test "$includedir" != "/usr/include"; then
     the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
 else
diff --git a/xsltConf.sh.in b/xsltConf.sh.in
index 666774b6..43ae001f 100644
--- a/xsltConf.sh.in
+++ b/xsltConf.sh.in
@@ -2,6 +2,6 @@
 # Configuration file for using the xslt library
 #
 XSLT_LIBDIR="@XSLT_LIBDIR@"
-XSLT_LIBS="@XSLT_LIBS@"
+XSLT_LIBS="-lxslt"
 XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@"
 MODULE_VERSION="xslt-@VERSION@"
diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
index 3c83abda..7567258a 100644
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -572,7 +572,7 @@ main(int argc, char **argv)
 
     sec = xsltNewSecurityPrefs();
     xsltSetDefaultSecurityPrefs(sec);
-    defaultEntityLoader = xmlGetExternalEntityLoader();
+    defaultEntityLoader = getenv("RPM_PACKAGE_NAME") ? xmlNoNetExternalEntityLoader : xmlGetExternalEntityLoader();
     xmlSetExternalEntityLoader(xsltprocExternalEntityLoader);
 
     for (i = 1; i < argc; i++) {