c_cpp/libxmlpatch
SHA256
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch to disable testing on dists that have a "check-devel" that is either not available, or too old + fix missing Requires in -devel

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxmlpatch?expand=0&rev=3
This commit is contained in:
Pascal Bleser
2011-04-03 00:22:37 +00:00
committed by Git OBS Bridge
parent 3ea30bcee1
commit 598bf89b45
2 changed files with 191 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
libxmlpatch-disable_tests.patch Normal file
View File

@@ -0,0 +1,183 @@
--- tests/Makefile.in.orig 2011-04-03 02:16:43.000000000 +0200
+++ tests/Makefile.in 2011-04-03 02:17:53.000000000 +0200
@@ -34,8 +34,6 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-TESTS = test-diff$(EXEEXT)
-test_PROGRAMS = test-diff$(EXEEXT)
bin_PROGRAMS = xml_patch$(EXEEXT) xml_diff$(EXEEXT)
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -47,7 +45,7 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)"
+am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS) $(test_PROGRAMS)
am_test_diff_OBJECTS = test_diff-check_diff.$(OBJEXT)
test_diff_OBJECTS = $(am_test_diff_OBJECTS)
@@ -213,10 +211,6 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-test_diff_SOURCES = check_diff.c
-test_diff_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/diff @CHECK_CFLAGS@ $(DEPS_XML_CFLAGS) $(DEPS_GLIB_CFLAGS)
-test_diff_LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxmlpatch.la $(top_builddir)/diff/libxmldiff.la $(DEPS_XML_LIBS) $(DEPS_GLIB_LIBS)
-testdir = $(libdir)/tests/xml_diff
xml_patch_CFLAGS = -I$(top_srcdir)/src $(DEPS_XML_CFLAGS)
xml_patch_SOURCES = xml_patch_main.c
xml_patch_LDADD = $(top_builddir)/src/libxmlpatch.la $(DEPS_XML_LIBS)
--- tests/Makefile.am.orig 2011-04-03 02:16:28.000000000 +0200
+++ tests/Makefile.am 2011-04-03 02:16:40.000000000 +0200
@@ -1,11 +1,3 @@
-TESTS = test-diff
-
-test_PROGRAMS = test-diff
-test_diff_SOURCES = check_diff.c
-test_diff_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/diff @CHECK_CFLAGS@ $(DEPS_XML_CFLAGS) $(DEPS_GLIB_CFLAGS)
-test_diff_LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxmlpatch.la $(top_builddir)/diff/libxmldiff.la $(DEPS_XML_LIBS) $(DEPS_GLIB_LIBS)
-testdir = $(libdir)/tests/xml_diff
-
bin_PROGRAMS = xml_patch xml_diff
xml_patch_CFLAGS = -I$(top_srcdir)/src $(DEPS_XML_CFLAGS)
@@ -14,4 +6,4 @@
xml_diff_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/diff $(DEPS_XML_CFLAGS) $(DEPS_GLIB_CFLAGS)
xml_diff_SOURCES = xml_diff_main.c
-xml_diff_LDADD = $(top_builddir)/src/libxmlpatch.la $(top_builddir)/diff/libxmldiff.la $(DEPS_XML_LIBS) $(DEPS_GLIB_LIBS)
\ No newline at end of file
+xml_diff_LDADD = $(top_builddir)/src/libxmlpatch.la $(top_builddir)/diff/libxmldiff.la $(DEPS_XML_LIBS) $(DEPS_GLIB_LIBS)
--- tests/Makefile.orig 2011-04-03 02:17:58.000000000 +0200
+++ tests/Makefile 2011-04-03 02:18:15.000000000 +0200
@@ -34,8 +34,6 @@
POST_UNINSTALL = :
build_triplet = i686-pc-linux-gnu
host_triplet = i686-pc-linux-gnu
-TESTS = test-diff$(EXEEXT)
-test_PROGRAMS = test-diff$(EXEEXT)
bin_PROGRAMS = xml_patch$(EXEEXT) xml_diff$(EXEEXT)
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -47,8 +45,8 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)"
-PROGRAMS = $(bin_PROGRAMS) $(test_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
am_test_diff_OBJECTS = test_diff-check_diff.$(OBJEXT)
test_diff_OBJECTS = $(am_test_diff_OBJECTS)
am__DEPENDENCIES_1 =
--- configure.in.orig 2011-04-03 02:19:15.000000000 +0200
+++ configure.in 2011-04-03 02:19:24.000000000 +0200
@@ -74,7 +74,6 @@
PKG_CHECK_MODULES(DEPS_XML, libxml-2.0)
PKG_CHECK_MODULES(DEPS_GLIB, glib-2.0)
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
AC_SUBST(DEPS_XML_CFLAGS)
AC_SUBST(DEPS_XML_LIBS)
--- configure.orig 2011-04-03 02:19:28.000000000 +0200
+++ configure 2011-04-03 02:19:38.000000000 +0200
@@ -10888,96 +10888,6 @@
:
fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
-$as_echo_n "checking for CHECK... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$CHECK_CFLAGS"; then
- pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "check >= 0.9.4") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.4" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$CHECK_LIBS"; then
- pkg_cv_CHECK_LIBS="$CHECK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "check >= 0.9.4") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.4" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check >= 0.9.4"`
- else
- CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.4"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$CHECK_PKG_ERRORS" >&5
-
- as_fn_error "Package requirements (check >= 0.9.4) were not met:
-
-$CHECK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables CHECK_CFLAGS
-and CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables CHECK_CFLAGS
-and CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
-else
- CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
- CHECK_LIBS=$pkg_cv_CHECK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- :
-fi
-

8
libxmlpatch.spec
View File

@@ -8,13 +8,16 @@ Summary: XML Patch Library
# http://prdownloads.sourceforge.net/xmlpatch/libxmlpatch-%{version}.tar.gz # http://prdownloads.sourceforge.net/xmlpatch/libxmlpatch-%{version}.tar.gz
Source: libxmlpatch-%{version}.tar.bz2 Source: libxmlpatch-%{version}.tar.bz2
Patch1: libxmlpatch-upgrade_check.patch Patch1: libxmlpatch-upgrade_check.patch
Patch2: libxmlpatch-disable_tests.patch
URL: http://xmlpatch.sourceforge.net/ URL: http://xmlpatch.sourceforge.net/
Group: System/Libraries Group: System/Libraries
License: GNU Lesser General Public License version 2.1 or later (LGPL v2.1 or later) License: GNU Lesser General Public License version 2.1 or later (LGPL v2.1 or later)
BuildRoot: %{_tmppath}/build-%{name}-%{version} BuildRoot: %{_tmppath}/build-%{name}-%{version}
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
%if 0%{?suse_version} >= 1110
BuildRequires: check-devel BuildRequires: check-devel
%endif
BuildRequires: gcc make glibc-devel pkgconfig BuildRequires: gcc make glibc-devel pkgconfig
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
@@ -42,6 +45,8 @@ patches can be applied to an existing initial XML document.
Summary: XML Patch Library Summary: XML Patch Library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: libxml2-devel
Requires: glib2-devel
%description devel %description devel
Extensible Markup Language (XML) documents are widely used as containers for Extensible Markup Language (XML) documents are widely used as containers for
@@ -72,6 +77,9 @@ files.
%if 0%{?suse_version} >= 1130 %if 0%{?suse_version} >= 1130
%patch1 %patch1
%endif %endif
%if 0%{?suse_version} < 1110
%patch2
%endif
%build %build
%configure %configure