Hello community,
here is the log from the commit of package vdr-plugin-satip for
openSUSE:Factory checked in at 2016-06-21 11:30:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vdr-plugin-satip (Old)
and /work/SRC/openSUSE:Factory/.vdr-plugin-satip.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vdr-plugin-satip"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vdr-plugin-satip/vdr-plugin-satip.changes
2016-06-19 10:50:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vdr-plugin-satip.new/vdr-plugin-satip.changes
2016-06-21 12:29:18.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Jun 19 11:41:47 UTC 2016 - seife+...@b1-systems.com
+
+- use pugixml where available (Leap 42.1+)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vdr-plugin-satip.spec ++++++
--- /var/tmp/diff_new_pack.Ms2k8J/_old 2016-06-21 12:29:19.000000000 +0200
+++ /var/tmp/diff_new_pack.Ms2k8J/_new 2016-06-21 12:29:19.000000000 +0200
@@ -17,6 +17,14 @@
#
+## ugly, but should work.
+## note that SLES12 has neither pugixml nor tinyxml, so it does not need to be
considered here
+%if (0%{?suse_version} > 1310 && 0%{?suse_version} != 1320)
+%define have_pugixml 1
+%else
+%define have_pugixml 0
+%endif
+
Name: vdr-plugin-satip
Version: 2.2.3
Release: 0
@@ -28,7 +36,11 @@
Patch0: vdr-satip-gcc6.patch
BuildRequires: gcc-c++
BuildRequires: pkg-config
+%if %have_pugixml
+BuildRequires: pugixml-devel
+%else
BuildRequires: tinyxml-devel
+%endif
BuildRequires: vdr-devel >= 2.0.0
BuildRequires: pkgconfig(libcurl) >= 7.36.0
Requires(pre): %{vdr_prereq}
@@ -50,7 +62,10 @@
%build
# use msgmerge wrapper
export PATH=%{_datadir}/vdr:$PATH
-make %{?_smp_mflags} SATIP_USE_TINYXML=1
+%if ! %have_pugixml
+XMLTOOL="SATIP_USE_TINYXML=1"
+%endif
+make %{?_smp_mflags} $XMLTOOL
%install
make install DESTDIR=%{buildroot}
