From a985d0c655d6ef90df4fe077767c961963e865c8578cbb9f09c94950d2d3ed15 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 3 Apr 2018 13:23:28 +0000 Subject: [PATCH 1/2] Accepting request 593226 from home:pluskalm:branches:Base:System - Update url - Small packaging cleanup with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/593226 OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=26 --- fwupd.changes | 6 ++++++ fwupd.spec | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/fwupd.changes b/fwupd.changes index e833164..b41b43b 100644 --- a/fwupd.changes +++ b/fwupd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 3 13:14:02 UTC 2018 - mpluskal@suse.com + +- Update url +- Small packaging cleanup with spec-cleaner + ------------------------------------------------------------------- Fri Mar 23 20:06:34 UTC 2018 - antoine.belvire@opensuse.org diff --git a/fwupd.spec b/fwupd.spec index 1f96de7..65079cf 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -21,13 +21,14 @@ %else %bcond_with efi_fw_update %endif + Name: fwupd Version: 1.0.6 Release: 0 Summary: Allow session software to update device firmware License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Management -Url: https://pjones.fedorapeople.org/fwupdate/ +URL: https://fwupd.org/ Source: %{name}-%{version}.tar.xz BuildRequires: dejavu-fonts BuildRequires: docbook-utils-minimal @@ -47,6 +48,7 @@ BuildRequires: python3-Pillow BuildRequires: python3-cairo BuildRequires: python3-gobject-Gdk BuildRequires: python3-xml +BuildRequires: vala BuildRequires: pkgconfig(appstream-glib) >= 0.5.10 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(colorhug) >= 1.2.12 @@ -63,8 +65,6 @@ BuildRequires: pkgconfig(gusb) >= 0.2.9 BuildRequires: pkgconfig(json-glib-1.0) >= 1.1.1 BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libelf) -# BuildRequires: pkgconfig(libtbtfwu) >= 1 -BuildRequires: vala BuildRequires: pkgconfig(libgcab-1.0) BuildRequires: pkgconfig(libsoup-2.4) >= 2.51.92 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 @@ -76,7 +76,6 @@ BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(efiboot) BuildRequires: pkgconfig(efivar) BuildRequires: pkgconfig(fwup) >= 5 -#!BuildIgnore: shim %endif %ifarch %{ix86} x86_64 BuildRequires: pkgconfig(libsmbios_c) >= 2.3.0 @@ -138,7 +137,7 @@ if this gets used on other non-desktop hardware. %build # Dell support requires direct SMBIOS access, # Synaptics requires Dell support, i.e. x86 only -%{meson} \ +%meson \ %if %{without efi_fw_update} -Dplugin_uefi=false \ %endif @@ -147,10 +146,10 @@ if this gets used on other non-desktop hardware. -Dplugin_synaptics=false \ %endif -Dtests=false -%{meson_build} +%meson_build %install -%{meson_install} +%meson_install # README.md is packaged as doc rm %{buildroot}%{_localstatedir}/lib/fwupd/builder/README.md # Add SUSE specific rcfoo service symlink From 743c79e933e0406f2d66efed55d513e4237aaf3e0461d38d378580b3d50199cc Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 4 Apr 2018 10:15:25 +0000 Subject: [PATCH 2/2] Accepting request 593443 from home:dimstar:Factory - Update hasbang in installed files from /usr/bin/env python3 to /usr/bin/python3. OBS-URL: https://build.opensuse.org/request/show/593443 OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=27 --- fwupd.changes | 6 ++++++ fwupd.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/fwupd.changes b/fwupd.changes index b41b43b..1b94029 100644 --- a/fwupd.changes +++ b/fwupd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 4 09:43:55 UTC 2018 - dimstar@opensuse.org + +- Update hasbang in installed files from /usr/bin/env python3 to + /usr/bin/python3. + ------------------------------------------------------------------- Tue Apr 3 13:14:02 UTC 2018 - mpluskal@suse.com diff --git a/fwupd.spec b/fwupd.spec index 65079cf..785c81d 100644 --- a/fwupd.spec +++ b/fwupd.spec @@ -21,7 +21,6 @@ %else %bcond_with efi_fw_update %endif - Name: fwupd Version: 1.0.6 Release: 0 @@ -133,6 +132,9 @@ if this gets used on other non-desktop hardware. %prep %setup -q +for file in $(grep -l %{_bindir}/env . -r); do + sed -i "s|%{_bindir}/env python3|%{_bindir}/python3|" $file +done %build # Dell support requires direct SMBIOS access,