summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-10-02 06:22:30 +0200
committerRemi Collet <fedora@famillecollet.com>2013-10-02 06:22:30 +0200
commitd81c8099a5207b58c80124f63052444865205ec7 (patch)
tree8de216fc1189719620ef25bb7a39a3c3a764cff0
parent13d40d818a9f89a71259a00d4d9847ef369b499f (diff)
php-pecl-xmldiff: 0.9.0
-rw-r--r--php-pecl-xmldiff.spec13
-rw-r--r--xmldiff-system-diffmark.patch142
2 files changed, 7 insertions, 148 deletions
diff --git a/php-pecl-xmldiff.spec b/php-pecl-xmldiff.spec
index 4abbee3..b3b7cdf 100644
--- a/php-pecl-xmldiff.spec
+++ b/php-pecl-xmldiff.spec
@@ -15,16 +15,13 @@
Summary: XML diff and merge
Name: php-pecl-%{pecl_name}
-Version: 0.8.0
+Version: 0.9.0
Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: BSD
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-# use syste diffmark library instead of bundled copy
-Patch0: xmldiff-system-diffmark.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-devel > 5.3
BuildRequires: php-pear
@@ -72,7 +69,6 @@ These are the files needed to compile programs using %{name}.
mv %{pecl_name}-%{version} NTS
cd NTS
-%patch0 -p0
# drop bundled library to ensure it is not used
rm -rf diffmark
@@ -183,7 +179,7 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc NTS/CREDITS
+%doc NTS/{CREDITS,LICENSE}
%{pecl_xmldir}/%{name}.xml
%config(noreplace) %{php_inidir}/%{pecl_name}.ini
%{php_extdir}/%{pecl_name}.so
@@ -203,5 +199,10 @@ rm -rf %{buildroot}
%changelog
+* Wed Oct 02 2013 Remi Collet <remi@fedoraproject.org> - 0.9.0-1
+- Update to 0.9.0
+- License now provided in upstream sources
+- Drop merged patch for system libdiffmark
+
* Sun Sep 29 2013 Remi Collet <remi@fedoraproject.org> - 0.8.0-1
- initial package
diff --git a/xmldiff-system-diffmark.patch b/xmldiff-system-diffmark.patch
deleted file mode 100644
index 7443064..0000000
--- a/xmldiff-system-diffmark.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Index: config.m4
-===================================================================
---- config.m4 (révision 331572)
-+++ config.m4 (copie de travail)
-@@ -2,11 +2,13 @@
- dnl config.m4 for extension xmldiff
-
- PHP_ARG_ENABLE(xmldiff, whether to enable xmldiff support,
--[ --enable-xmldiff Enable xmldiff support])
-+[ --enable-xmldiff Enable xmldiff support])
-+PHP_ARG_WITH(libdiffmark, whether to use system diffmark library,
-+[ --with-libdiffmark=DIR XMLDiff: diffmark install prefix], no, no)
-
- if test -z "$PHP_LIBXML_DIR"; then
- PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-- [ --with-libxml-dir=DIR XMLDiff: libxml2 install prefix], no, no)
-+ [ --with-libxml-dir=DIR XMLDiff: libxml2 install prefix], no, no)
- fi
-
- if test "$PHP_XMLDIFF" != "no"; then
-@@ -21,45 +23,83 @@
- AC_MSG_ERROR([XMLDiff extension requires DOM extension])
- fi
-
-- PHP_DIFFMARK_SOURCES="diffmark/lib/compare.cc \
-- diffmark/lib/diff.cc \
-- diffmark/lib/link.cc \
-- diffmark/lib/merge.cc \
-- diffmark/lib/namespacecollector.cc \
-- diffmark/lib/nspace.cc \
-- diffmark/lib/target.cc \
-- diffmark/lib/xbuffer.cc \
-- diffmark/lib/xdoc.cc \
-- diffmark/lib/xutil.cc"
-+ if test "$PHP_LIBDIFFMARK" != "no"; then
-+ SEARCH_PATH="/usr /usr/local"
-+ SEARCH_FOR="/include/diffmark/diff.hh"
-+ AC_MSG_CHECKING([for diffmark headers])
-+ if test -r $PHP_LIBDIFFMARK/$SEARCH_FOR; then # path given as parameter
-+ LIBDIFFMARK_DIR=$PHP_LIBDIFFMARK
-+ else
-+ for i in $SEARCH_PATH ; do
-+ if test -r $i/$SEARCH_FOR; then
-+ LIBDIFFMARK_DIR=$i
-+ fi
-+ done
-+ fi
-+
-+ if test -z "$LIBDIFFMARK_DIR"; then
-+ AC_MSG_RESULT([not found])
-+ AC_MSG_ERROR([The required diffmark library was not found.])
-+ else
-+ AC_MSG_RESULT(found in $LIBDIFFMARK_DIR)
-+ fi
-
-+ PHP_ADD_INCLUDE($LIBDIFFMARK_DIR/include/diffmark)
-+ AC_DEFINE(HAVE_LIBDIFFMARK,1,[Use system diffmark library])
-+ PHP_ADD_LIBRARY_WITH_PATH(diffmark, $LIBDIFFMARK_DIR/lib, XMLDIFF_SHARED_LIBADD)
-
-- PHP_SETUP_LIBXML(XMLDIFF_SHARED_LIBADD, [
-- AC_DEFINE(HAVE_XMLDIFF,1,[ ])
-- PHP_SUBST(XMLDIFF_SHARED_LIBADD)
-- PHP_NEW_EXTENSION(xmldiff, $PHP_DIFFMARK_SOURCES xmldiff.cpp, $ext_shared)
-- PHP_ADD_EXTENSION_DEP(xmldiff, dom, true)
-- PHP_ADD_EXTENSION_DEP(xmldiff, libxml, true)
-- PHP_ADD_BUILD_DIR($ext_builddir/diffmark/lib)
-- PHP_ADD_INCLUDE($ext_srcdir/diffmark/lib)
-- PHP_ADD_INCLUDE($ext_builddir/diffmark/lib)
-- PHP_ADD_INCLUDE($ext_srcdir/simplexml_compat)
-- PHP_ADD_INCLUDE($ext_builddir/simplexml_compat)
-- PHP_INSTALL_HEADERS([ext/xmldiff/php_xmldiff.h])
-- PHP_INSTALL_HEADERS([diffmark/lib/compare.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/compareimpl.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/diff.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/lcs.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/lcsimpl.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/link.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/merge.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/namespacecollector.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/nspace.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/target.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/xbuffer.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/xdoc.hh])
-- PHP_INSTALL_HEADERS([diffmark/lib/xutil.hh])
-- ], [
-- AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
-- ])
-+ PHP_SETUP_LIBXML(XMLDIFF_SHARED_LIBADD, [
-+ AC_DEFINE(HAVE_XMLDIFF,1,[ ])
-+ PHP_SUBST(XMLDIFF_SHARED_LIBADD)
-+ PHP_NEW_EXTENSION(xmldiff, xmldiff.cpp, $ext_shared)
-+ PHP_ADD_EXTENSION_DEP(xmldiff, dom, true)
-+ PHP_ADD_EXTENSION_DEP(xmldiff, libxml, true)
-+ PHP_ADD_INCLUDE($ext_srcdir/simplexml_compat)
-+ PHP_ADD_INCLUDE($ext_builddir/simplexml_compat)
-+ PHP_INSTALL_HEADERS([ext/xmldiff/php_xmldiff.h])
-+ ], [
-+ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
-+ ])
-+ else
-+ PHP_DIFFMARK_SOURCES="diffmark/lib/compare.cc \
-+ diffmark/lib/diff.cc \
-+ diffmark/lib/link.cc \
-+ diffmark/lib/merge.cc \
-+ diffmark/lib/namespacecollector.cc \
-+ diffmark/lib/nspace.cc \
-+ diffmark/lib/target.cc \
-+ diffmark/lib/xbuffer.cc \
-+ diffmark/lib/xdoc.cc \
-+ diffmark/lib/xutil.cc"
-
-+ PHP_SETUP_LIBXML(XMLDIFF_SHARED_LIBADD, [
-+ AC_DEFINE(HAVE_XMLDIFF,1,[ ])
-+ PHP_SUBST(XMLDIFF_SHARED_LIBADD)
-+ PHP_NEW_EXTENSION(xmldiff, $PHP_DIFFMARK_SOURCES xmldiff.cpp, $ext_shared)
-+ PHP_ADD_EXTENSION_DEP(xmldiff, dom, true)
-+ PHP_ADD_EXTENSION_DEP(xmldiff, libxml, true)
-+ PHP_ADD_BUILD_DIR($ext_builddir/diffmark/lib)
-+ PHP_ADD_INCLUDE($ext_srcdir/diffmark/lib)
-+ PHP_ADD_INCLUDE($ext_builddir/diffmark/lib)
-+ PHP_ADD_INCLUDE($ext_srcdir/simplexml_compat)
-+ PHP_ADD_INCLUDE($ext_builddir/simplexml_compat)
-+ PHP_INSTALL_HEADERS([ext/xmldiff/php_xmldiff.h])
-+ PHP_INSTALL_HEADERS([diffmark/lib/compare.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/compareimpl.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/diff.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/lcs.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/lcsimpl.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/link.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/merge.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/namespacecollector.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/nspace.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/target.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/xbuffer.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/xdoc.hh])
-+ PHP_INSTALL_HEADERS([diffmark/lib/xutil.hh])
-+ ], [
-+ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
-+ ])
-+ fi
-+
- fi