Accepting request 145534 from devel:libraries:c_c++

update to 1.1.28

OBS-URL: https://build.opensuse.org/request/show/145534
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libxslt?expand=0&rev=40

libxslt-1.1.26.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bcf4aad227c3378f48e411a46c284b03afd15404a7d808a5faab938a2cc88952
-size 2341453

libxslt-1.1.28.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c
+size 3435907

libxslt-config-fixes.patch

@@ -1,16 +1,5 @@
---- xslt-config.in.orig
+--- xsltConf.sh.in.orig	2012-12-06 08:43:13.843408831 +0100
-+++ xslt-config.in
++++ xsltConf.sh.in	2012-12-06 08:43:22.617391851 +0100
-@@ -89,7 +89,7 @@ while test $# -gt 0; do
-     shift
- done
- 
--the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
-+the_libs="-lxslt"
- if test "$includedir" != "/usr/include"; then
-     the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
- else
---- xsltConf.sh.in.orig
-+++ xsltConf.sh.in
 @@ -2,6 +2,6 @@
  # Configuration file for using the xslt library
  #
@@ -19,3 +8,14 @@
 +XSLT_LIBS="-lxslt"
  XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@"
  MODULE_VERSION="xslt-@VERSION@"
+--- xslt-config.in.orig	2012-12-06 08:42:48.797457330 +0100
++++ xslt-config.in	2012-12-06 08:43:10.402415492 +0100
+@@ -89,7 +89,7 @@
+     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

libxslt-do_not_build_doc_nor_xsltproc.patch

@@ -0,0 +1,16 @@
+--- Makefile.am.orig	2012-09-04 16:26:23.000000000 +0200
++++ Makefile.am	2012-12-06 09:15:11.548926594 +0100
+@@ -1,12 +1,10 @@
+ SUBDIRS = \
+ 	libxslt \
+ 	libexslt \
+-	xsltproc \
+-	doc \
+ 	$(PYTHON_SUBDIR) \
+ 	tests
+ 
+-DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
++DIST_SUBDIRS = libxslt libexslt python tests
+ 
+ confexecdir=$(libdir)
+ confexec_DATA = xsltConf.sh

libxslt-python.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec  6 08:17:12 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 1.1.28: see changelog for libxslt1 1.1.28 for details
+- enforce having the same version of libxslt1
+
 -------------------------------------------------------------------
 Thu Feb 16 21:23:22 UTC 2012 - coolo@suse.com
 

libxslt-python.spec

@@ -23,15 +23,26 @@ BuildRequires:  libtool
 BuildRequires:  libxml2-devel
 BuildRequires:  libxml2-python
 BuildRequires:  python-devel
+BuildRequires:  python-xml
+%if 0%{?suse_version} >= 1220
+BuildRequires:  libxslt-tools
+Requires:       libxslt1 = %{version}
+%else
+BuildRequires:  libxslt1
+Requires:       libxslt1 = %{version}
+%endif
 Summary:        Python Bindings for libxslt
 License:        MIT
 Group:          Development/Libraries/Python
-Version:        1.1.26
+Version:        1.1.28
 Release:        0
-Source:         libxslt-%{version}.tar.bz2
+Source:         ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz
 # Uncomment to save space:
 #NoSource:      0
 Patch0:         libxslt-1.1.24-linkflags.patch
+# pbleser: don't build the doc subdir as it's broken and we don't install
+# it anyway; neither build the xsltproc subdir (not packaged here, faster)
+Patch1:         libxslt-do_not_build_doc_nor_xsltproc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{py_requires}
 Url:            http://xmlsoft.org/XSLT/
@@ -47,19 +58,14 @@ load and save XML and HTML files. Direct access to XPath and the XSLT
 transformation context are possible. Thus it is possible to extend the
 XSLT language with XPath functions written in Python.
 
-
-
-Authors:
---------
-    Daniel Veillard <daniel@veillard.com>
-
 %prep
 %setup -q -n libxslt-%{version}
 %patch0
+%patch1
 
 %build
 autoreconf --force --install
-%configure --with-python --with-pic --disable-static
+%configure --with-python=%__python --with-pic --disable-static --disable-silent-rules
 make %{?_smp_mflags} PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir}
 
 %install

libxslt.changes

@@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Thu Dec  6 07:59:17 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 1.1.28:
+  * fix generate-id() to avoid generating the same ID
+  * fix crash with empty xsl:key/@match attribute
+  * fix crash when passing an uninitialized variable to document()
+  * fix regression: default namespace not correctly used
+  * remove xsltTransStorageAdd and xsltTransStorageRemove from symbols.xml
+- changes from 1.1.27:
+  * link python module with python library (Frederic Crozat)
+  * report errors on variable use in key
+  * the XSLT namespace string is a constant one
+  * fix handling of names in xsl:attribute
+  * reserved namespaces in xsl:element and xsl:attribute
+  * null-terminate result string of cry:rc4_decrypt
+  * EXSLT date normalization fix
+  * exit after compilation of invalid func:result
+  * fix for EXSLT func:function
+  * rewrite EXSLT string:replace to be conformant
+  * avoid a heap use after free error
+  * fix a dictionary string usage
+  * output should not include extraneous newlines when indent is off
+  * document('') fails to return stylesheets parsed from memory
+  * xsltproc should return an error code if xinclude fails
+  * forwards-compatible processing of unknown top level elements
+  * fix system-property with unknown namespace
+  * fix default template processing on namespace nodes
+  * fix a bug in selecting XSLT elements
+  * fix a memory leak with xsl:number
+  * fix a problem with ESXLT date:add() with January
+  * fix generate-id() to not expose object addresses
+  * allow whitespace in xsl:variable with select
+  * fix direct pattern matching bug
+  * add the saxon:systemId extension
+  * add an append mode to document output
+  * fix portability to upcoming libxml2-2.9.0
+  * precompile patterns in xsl:number
+
+- change soname macro back to "1" and enforce it in the files list
+- revert -tools subpackage for openSUSE < 12.2 as that has only
+  become effective since 12.2 on the package that ships with the
+  distribution, to avoid having a completely different package
+  layout in this repository as compared to the stock distribution
+  packages (added a Provides: libxslt-tools though)
+
 -------------------------------------------------------------------
 Wed Apr 25 12:23:57 UTC 2012 - chris@computersalat.de
 

libxslt.spec

@@ -17,15 +17,16 @@
 
 
 Name:           libxslt
-%define soname  %{name}1
+%define soname  1
-Version:        1.1.26
+%define exslt_soname 0
+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
+Source:         ftp://xmlsoft.org/libxslt/libxslt-%{version}.tar.gz
 Source2:        baselibs.conf
 Source3:        xslt-config.1.gz
 Patch0:         %{name}-1.1.24-no-net-autobuild.patch
@@ -54,12 +55,15 @@ 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 -n %{soname}
+%package -n %{name}%{soname}
 Summary:        XSL Transformation Library
 License:        LGPL-2.1+
 Group:          System/Libraries
+%if 0%{?suse_version} < 1220
+Provides:       %{name}-tools = %{version}
+%endif
 
-%description -n %{soname}
+%description -n %{name}%{soname}
 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.
@@ -83,8 +87,10 @@ Group:          Development/Libraries/C and C++
 %ifarch ppc64
 Obsoletes:      %{name}-devel-64bit
 %endif
+%if 0%{?suse_version} >= 1220
 Requires:       %{name}-tools = %version
-Requires:       %{soname} = %{version}
+%endif
+Requires:       %{name}%{soname} = %{version}
 Requires:       glibc-devel
 Requires:       libgcrypt-devel
 Requires:       libgpg-error-devel
@@ -94,6 +100,7 @@ Requires:       libgpg-error-devel
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
+%if 0%{?suse_version} >= 1220
 %package tools
 Summary:        Extended Stylesheet Language (XSL) Transformation utilities
 License:        MIT and GPL-2.0+
@@ -105,6 +112,7 @@ Provides:       %{name} = %version-%release
 
 %description tools
 This package contains xsltproc, a command line interface to the XSLT engine.
+%endif
 
 %prep
 %setup -q
@@ -112,8 +120,8 @@ This package contains xsltproc, a command line interface to the XSLT engine.
 %patch1
 
 %build
-autoreconf --force --install
+autoreconf --force --install --verbose
-%configure --disable-static --with-pic --without-python
+%configure --disable-static --with-pic --without-python --disable-silent-rules
 make %{?_smp_mflags}
 
 %check
@@ -133,19 +141,31 @@ install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}'
 #kill all "la" files
 find %{buildroot} -type f -name "*.la" -print -delete
 
-%post -n %{soname} -p /sbin/ldconfig
+%post -n %{name}%{soname} -p /sbin/ldconfig
 
-%postun -n %{soname} -p /sbin/ldconfig
+%postun -n %{name}%{soname} -p /sbin/ldconfig
 
-%files -n %{soname}
+%files -n %{name}%{soname}
 %defattr(-, root, root)
-%{_libdir}/lib*.so.*
+%{_libdir}/libxslt.so.%{soname}
+%{_libdir}/libxslt.so.%{soname}.*
+%{_libdir}/libexslt.so.%{exslt_soname}
+%{_libdir}/libexslt.so.%{exslt_soname}.*
+%if 0%{?suse_version} >= 1220
+%files tools
+%defattr(-,root,root)
+%endif
+%doc AUTHORS NEWS README COPYING* Copyright TODO FEATURES
+%{_bindir}/xsltproc
+%doc %{_mandir}/man1/xsltproc.*
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/lib*.so
+%{_libdir}/libxslt.so
+%{_libdir}/libexslt.so
 %{_libdir}/*.sh
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/libxslt.pc
+%{_libdir}/pkgconfig/libexslt.pc
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_bindir}/xslt-config
@@ -154,10 +174,4 @@ find %{buildroot} -type f -name "*.la" -print -delete
 # not available doc/*.png
 %doc doc/*.html doc/html doc/tutorial doc/*.gif
 
-%files tools
-%defattr(-,root,root)
-%doc AUTHORS NEWS README COPYING* Copyright TODO FEATURES
-%{_bindir}/xsltproc
-%doc %{_mandir}/man1/xsltproc.*
-
 %changelog