#3 Remove unused Python dependencies
Closed 3 months ago by churchyard. Opened 3 months ago by lbalhar.
rpms/ lbalhar/bamf master  into  master

file modified
+16 -6

@@ -1,7 +1,7 @@ 

  Summary:        Application matching framework

  Name:           bamf

  Version:        0.5.4

- Release:        2%{?dist}.1

+ Release:        3%{?dist}.1

  # Library bits are LGPLv2 or LGPLv3 (but not open-ended LGPLv2+);

  # non-lib bits are GPLv3.

  # pbrobinson points out that three files in the lib are actually

@@ -12,12 +12,15 @@ 

  License:        GPLv2 or GPLv3

  URL:            https://launchpad.net/bamf

  Source0:        http://launchpad.net/bamf/0.5/%{version}/+download/%{name}-%{version}.tar.gz

+ # Modules libxml2 and libxslt were here only for tests/gtester2xunit.py

+ # but this script is not executed during build nor distributed in any RPM.

+ # Moreover, python[23]-libxslt aren't available in rawhide which is causing

+ # this package to FTBFS.

+ Patch0:         Disable-libxml2-and-libxslt-check.patch

  

  BuildRequires:  vala

  BuildRequires:  gtk-doc

  BuildRequires:  gobject-introspection-devel

- BuildRequires:  python2-libxml2

- BuildRequires:  python2-libxslt

  BuildRequires:  pkgconfig(gio-2.0)

  BuildRequires:  pkgconfig(gio-unix-2.0)

  BuildRequires:  pkgconfig(glib-2.0)

@@ -59,10 +62,14 @@ 

  %prep

  %autosetup -p1

  

+ # autotools add -Werror after our flags, and there are glib deprecation warnings

+ # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=940164

+ sed -i 's/ -Werror//' configure*

+ 

+ 

  %build

- CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"

- PYTHON="/usr/bin/python2"

- export CFLAGS PYTHON

+ CFLAGS="$RPM_OPT_FLAGS"

+ export CFLAGS

  %configure --disable-static --disable-webapps --enable-gtk-doc

  make %{?_smp_mflags}

  

@@ -105,6 +112,9 @@ 

  %exclude %{_datadir}/upstart/sessions/bamfdaemon.conf

  

  %changelog

+ * Thu Oct 17 2019 Lumír Balhar <lbalhar@redhat.com> - 0.5.4-3.1

+ - Remove unused Python dependencies

+ 

  * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-2.1

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

Hello.

Modules libxml2 and libxslt are in the build dependencies only for tests/gtester2xunit.py but this script is not executed during build nor distributed in any RPM. Moreover, python[23]-libxslt aren't available in rawhide which is one reason why this package FTBFS in rawhide and F31.

This is a quick fix for one problem this package has. We can try to rewrite the script to Python 3 and lxml but it makes sense only if you want to run tests in RPM build. I'm gonna also open a FTBFS bug for the second problem I've found.

F30 scratch build is ok: https://koji.fedoraproject.org/koji/taskinfo?taskID=38338440
F32 scratch build fails: https://koji.fedoraproject.org/koji/taskinfo?taskID=38338549

See also mine https://src.fedoraproject.org/rpms/bamf/pull-request/2 - it includes a FTBFS fix.

Not using Python at all is probably better, but please cherry pick the extra commits.

1 new commit added

  • Remove -Werror to be able to build with recent glib
3 months ago

Cherry-picked the commit with fixed CFLAGS.

I don't have a preference over which PR to merge. This one is simpler. The other one is future proof for tests. I'd leave that to the maintainers.

the other one was merged.

Pull-Request has been closed by churchyard

3 months ago

I didn't actually see that one, but hey, running tests is good I guess. So let's stick with that.

Note that the tests currently don't run either way :( (there's no %check).