rpm/bamf
SHA256
1
0
Fork 0
forked from pool/bamf
Code Pull Requests Activity

- Update to version 0.5.4.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:Unity/bamf?expand=0&rev=10
This commit is contained in:
Alexei Sorokin 2019-12-09 22:41:39 +00:00 committed by Git OBS Bridge
parent a1c14598eb
commit 6e11493f05
7 changed files with 79 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bamf-0.5.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:340d7b5a463afcd33135ae73a7e4cf6a93a4daaf6f72b70abc09dc66d18a3b14
size 633666

7
bamf-0.5.3.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iF4EABEIAAYFAle/EMQACgkQy6VOJFdF1OpmIQD/Q8lnd/Z09GvyTCuXpvA2DBOR
Jvw4Ct8fIQ4klKpmHacBAL/a5di5KX8PR7diLMx3aEV/vi19D8is429u1sSDuFrR
=Jbcb
-----END PGP SIGNATURE-----

3
bamf-0.5.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5bb87a5bf46ab1fc9a229a851c0ee4f610d943716a7c83d318f6a8f50d76beb3
size 638756

7
bamf-0.5.4.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHUEABEIAB0WIQTLueyV72w0rmtoTs3LpU4kV0XU6gUCW+NqEQAKCRDLpU4kV0XU
6hI/AQCETR0A8BxqF5MMGqLVdELKO2eSPbY0HWvzqgXOvE5ekQD/auul2S3fDwBA
Ira4PQYJL5zCnKFEzrHr43+EVouhMv4=
=c2Nw
-----END PGP SIGNATURE-----

47
bamf-fix-gtester2xunit.patch Normal file
View File

@ -0,0 +1,47 @@
--- 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):

10
bamf.changes
View File

@ -1,7 +1,13 @@
-------------------------------------------------------------------
Thu Oct 17 14:20:56 UTC 2019 - Richard Brown <rbrown@suse.com>
Mon Dec 9 20:40:24 UTC 2019 - Alexei Sorokin <sor.alexei@meowr.ru>
- Remove obsolete Groups tag (fate#326485)
- 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.
-------------------------------------------------------------------
Fri Sep 27 11:27:36 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

44
bamf.spec
View File

@ -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,18 +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
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)
@ -90,7 +92,8 @@ bamf matches application windows to desktop files.
This package contains files that are needed to build applications.
%prep
%setup -q
%autosetup -p1
sed -i '/^CFLAGS=/s/-Werror //' configure.ac
%build
@ -98,53 +101,35 @@ NOCONFIGURE=1 gnome-autogen.sh
%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/
@ -152,7 +137,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/pkgconfig/libbamf%{_binver}.pc
%files doc
%defattr(-,root,root)
%doc %{_datadir}/gtk-doc/
%changelog