Author: tommat Date: Mon Jun 29 05:37:51 2009 GMT Module: packages Tag: HEAD ---- Log message: - fix build with new libtool - pass cxxflags - builds now, rel 4
---- Files affected: packages/libxslt: libxslt.spec (1.141 -> 1.142) , libxslt-makefile.patch (NONE -> 1.1) (NEW), libxslt-m4.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/libxslt/libxslt.spec diff -u packages/libxslt/libxslt.spec:1.141 packages/libxslt/libxslt.spec:1.142 --- packages/libxslt/libxslt.spec:1.141 Sun Oct 12 12:40:01 2008 +++ packages/libxslt/libxslt.spec Mon Jun 29 07:37:46 2009 @@ -12,13 +12,15 @@ Summary(pt_BR.UTF-8): Biblioteca que disponibiliza o sistema XSLT do GNOME Name: libxslt Version: 1.1.24 -Release: 3 +Release: 4 License: MIT Group: Libraries #Source0: http://ftp.gnome.org/pub/GNOME/sources/libxslt/1.1/%{name}-%{version}.tar.bz2 Source0: ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz # Source0-md5: e83ec5d27fc4c10c6f612879bea9a153 Patch0: %{name}-exslt_crypt.patch +Patch1: %{name}-m4.patch +Patch2: %{name}-makefile.patch URL: http://xmlsoft.org/XSLT/ BuildRequires: autoconf BuildRequires: automake @@ -119,7 +121,9 @@ %prep %setup -q -%patch0 +%patch0 -p0 +%patch1 -p0 +%patch2 -p1 %build %{__libtoolize} @@ -212,6 +216,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.142 2009/06/29 05:37:46 tommat +- fix build with new libtool +- pass cxxflags +- builds now, rel 4 + Revision 1.141 2008/10/12 10:40:01 patrys - rel 3 ================================================================ Index: packages/libxslt/libxslt-makefile.patch diff -u /dev/null packages/libxslt/libxslt-makefile.patch:1.1 --- /dev/null Mon Jun 29 07:37:51 2009 +++ packages/libxslt/libxslt-makefile.patch Mon Jun 29 07:37:46 2009 @@ -0,0 +1,11 @@ +--- libxslt-1.1.24/libexslt/Makefile.am.orig 2009-06-29 07:27:19.000000000 +0200 ++++ libxslt-1.1.24/libexslt/Makefile.am 2009-06-29 07:27:33.000000000 +0200 +@@ -11,8 +11,6 @@ + exsltinc_HEADERS = \ + exslt.h \ + exsltconfig.h \ +- exslt.h \ +- exsltconfig.h \ + exsltexports.h + + libexslt_la_SOURCES = \ ================================================================ Index: packages/libxslt/libxslt-m4.patch diff -u /dev/null packages/libxslt/libxslt-m4.patch:1.1 --- /dev/null Mon Jun 29 07:37:51 2009 +++ packages/libxslt/libxslt-m4.patch Mon Jun 29 07:37:46 2009 @@ -0,0 +1,38 @@ +--- libxslt.m4 2004-05-17 05:25:26.000000000 +0200 ++++ libxslt.m4.patched 2004-07-26 06:05:36.000000000 +0200 +@@ -52,8 +52,10 @@ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_xslttest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" ++ ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $XSLT_CFLAGS" ++ CXXFLAGS="$CFLAGS" + LIBS="$XSLT_LIBS $LIBS" + dnl + dnl Now check if the installed libxslt is sufficiently new. +@@ -138,6 +140,7 @@ + } + ],, no_xslt=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" ++ CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi +@@ -158,6 +161,7 @@ + else + echo "*** Could not run libxslt test program, checking why..." + CFLAGS="$CFLAGS $XSLT_CFLAGS" ++ CXXFLAGS="$CFLAGS" + LIBS="$LIBS $XSLT_LIBS" + AC_TRY_LINK([ + #include <libxslt/xslt.h> +@@ -177,6 +181,7 @@ + echo "*** or that you have moved LIBXSLT since it was installed. In the latter case, you" + echo "*** may want to edit the xslt-config script: $XSLT_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" ++ CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxslt/libxslt.spec?r1=1.141&r2=1.142&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
