Hello community, here is the log from the commit of package bamf for openSUSE:Factory checked in at 2019-12-10 22:42:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bamf (Old) and /work/SRC/openSUSE:Factory/.bamf.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bamf" Tue Dec 10 22:42:09 2019 rev:6 rq:755398 version:0.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/bamf/bamf.changes 2019-09-30 15:58:58.153285242 +0200 +++ /work/SRC/openSUSE:Factory/.bamf.new.4691/bamf.changes 2019-12-10 22:42:20.957810761 +0100 @@ -1,0 +2,11 @@ +Mon Dec 9 20:40:24 UTC 2019 - Alexei Sorokin <sor.ale...@meowr.ru> + +- Update to version 0.5.4: + * See /usr/share/doc/packages/bamf-daemon/ChangeLog +- Add bamf-fix-gtester2xunit.patch: Make gtester2xunit requirements + easier to meet. + BuildRequire python3-lxml instead of libxslt-python and + python2-libxml2. +- Drop openSUSE Leap 42.3 support. + +------------------------------------------------------------------- Old: ---- bamf-0.5.3.tar.gz bamf-0.5.3.tar.gz.asc New: ---- bamf-0.5.4.tar.gz bamf-0.5.4.tar.gz.asc bamf-fix-gtester2xunit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bamf.spec ++++++ --- /var/tmp/diff_new_pack.TRHP74/_old 2019-12-10 22:42:21.433810585 +0100 +++ /var/tmp/diff_new_pack.TRHP74/_new 2019-12-10 22:42:21.437810584 +0100 @@ -1,7 +1,7 @@ # # spec file for package bamf # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,19 +20,20 @@ %define _binver 3 %define _version 0.5 Name: bamf -Version: 0.5.3 +Version: 0.5.4 Release: 0 Summary: Window matching library License: GPL-3.0-only AND LGPL-3.0-only -Group: Development/Libraries/C and C++ -Url: https://launchpad.net/bamf +URL: https://launchpad.net/bamf Source: https://launchpad.net/bamf/%{_version}/%{version}/+download/bamf-%{version}.tar.gz Source2: https://launchpad.net/bamf/%{_version}/%{version}/+download/bamf-%{version}.tar.gz.asc Source3: %{name}.keyring +# PATCH-FIX-OPENSUSE bamf-fix-gtester2xunit.patch -- Make gtester2xunit requirements easier to meet. +Patch0: bamf-fix-gtester2xunit.patch BuildRequires: gnome-common -BuildRequires: libxslt-python BuildRequires: pkgconfig -BuildRequires: python2-libxml2 +BuildRequires: python3 +BuildRequires: python3-lxml BuildRequires: vala BuildRequires: pkgconfig(gio-2.0) >= 2.30.0 BuildRequires: pkgconfig(gio-unix-2.0) @@ -48,7 +49,6 @@ %package daemon Summary: Window matching daemon -Group: System/Daemons Requires: %{lname} = %{version} %description daemon @@ -60,7 +60,6 @@ %package doc Summary: Documentation for libbamf and libbamf3 -Group: Documentation/HTML BuildArch: noarch %description doc @@ -68,7 +67,6 @@ %package -n %{lname} Summary: Window matching library -Group: System/Libraries %description -n %{lname} bamf matches application windows to desktop files. @@ -77,7 +75,6 @@ %package -n typelib-1_0-Bamf-%{_binver}_0 Summary: Introspection bindings for the BAMF window matching library -Group: System/Libraries %description -n typelib-1_0-Bamf-%{_binver}_0 This package contains introspection data for the Bamf library. @@ -86,7 +83,6 @@ %package devel Summary: Development files for the BAMF window matching library -Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} Requires: typelib-1_0-Bamf-%{_binver}_0 @@ -96,7 +92,8 @@ This package contains files that are needed to build applications. %prep -%setup -q +%autosetup -p1 + sed -i '/^CFLAGS=/s/-Werror //' configure.ac %build @@ -104,53 +101,35 @@ %configure \ --disable-static \ --enable-gtk-doc -make %{?_smp_mflags} V=1 +%make_build %install %make_install -%if 0%{?suse_version} <= 1320 && 0%{?sle_version} < 120200 -rm -r %{buildroot}%{_libexecdir}/systemd/user/bamfdaemon.service -%endif rm -r %{buildroot}%{_datadir}/upstart/ find %{buildroot} -type f -name "*.la" -delete -print -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 -%post -%systemd_user_post bamf.service - -%preun -%systemd_user_preun bamf.service - -%postun -%systemd_user_postun bamf.service -%endif - %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig %files daemon -%defattr(-,root,root) -%doc COPYING COPYING.LGPL TODO +%license COPYING COPYING.LGPL +%doc ChangeLog TODO %{_libexecdir}/bamf/ %{_datadir}/dbus-1/services/org.ayatana.bamf.service -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 %{_userunitdir}/bamfdaemon.service -%endif %files -n %{lname} -%defattr(-,root,root) -%doc COPYING COPYING.LGPL TODO +%license COPYING COPYING.LGPL +%doc ChangeLog TODO %{_libdir}/libbamf%{_binver}.so.* %files -n typelib-1_0-Bamf-%{_binver}_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/ %files devel -%defattr(-,root,root) %{_includedir}/libbamf%{_binver}/ %{_libdir}/libbamf%{_binver}.so %{_datadir}/vala/ @@ -158,7 +137,6 @@ %{_libdir}/pkgconfig/libbamf%{_binver}.pc %files doc -%defattr(-,root,root) %doc %{_datadir}/gtk-doc/ %changelog ++++++ bamf-0.5.3.tar.gz -> bamf-0.5.4.tar.gz ++++++ ++++ 8915 lines of diff (skipped) ++++++ bamf-fix-gtester2xunit.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -113,11 +113,11 @@ GTK_DOC_CHECK(1.0) # gtester2xunit checks # ########################### -AC_PATH_PROG([PYTHON],[python]) +AC_PATH_PROG([PYTHON], [python3]) AC_MSG_CHECKING(for gtester2xunit dependencies) -if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then +if !($PYTHON -c "import lxml" 2> /dev/null); then AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]); + AC_MSG_ERROR([You need to install python3-lxml]); fi AC_MSG_RESULT([yes]) --- a/tests/gtester2xunit.py +++ b/tests/gtester2xunit.py @@ -1,18 +1,17 @@ -#! /usr/bin/python -from argparse import ArgumentParser -import libxslt -import libxml2 -import sys +#!/usr/bin/python3 import os +import sys +from argparse import ArgumentParser +from lxml import etree XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl' def transform_file(input_filename, output_filename, xsl_file): - gtester = libxml2.parseFile(xsl_file) - style = libxslt.parseStylesheetDoc(gtester) - doc = libxml2.parseFile(input_filename) - result = style.applyStylesheet(doc, None) - result.saveFormatFile(filename=output_filename, format=True) + gtester = etree.parse(xsl_file) + style = etree.XSLT(gtester) + doc = etree.parse(input_filename) + result = style(doc) + result.write(output_filename, pretty_print=True) def get_output_filename(input_filename):
