From 1bad610a82ab1aaba92458f888bfc6300bd2bdf0 Mon Sep 17 00:00:00 2001
From: Andrew Clemons
Date: Sat, 5 Jan 2019 11:27:57 +1300
Subject: system/fwupd: Updated for version 1.2.3.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
---
 system/fwupd/README           |  2 +-
 system/fwupd/doinst.sh        |  4 ++++
 system/fwupd/fwupd.SlackBuild | 15 +++++++++++----
 system/fwupd/fwupd.info       |  8 ++++----
 4 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'system/fwupd')

diff --git a/system/fwupd/README b/system/fwupd/README
index 97f9f4281f..d7427c9344 100644
--- a/system/fwupd/README
+++ b/system/fwupd/README
@@ -7,4 +7,4 @@ Options (all default to false):
   ENABLE_UEFI: true|false - requires pygobject3-python3 python3-pillow
                                      py3cairo
 
-  https://github.com/hughsie/fwupd/blob/1.1.3/meson_options.txt
+  https://github.com/hughsie/fwupd/blob/1.2.3/meson_options.txt
diff --git a/system/fwupd/doinst.sh b/system/fwupd/doinst.sh
index 2adacc1286..d98d893e0a 100644
--- a/system/fwupd/doinst.sh
+++ b/system/fwupd/doinst.sh
@@ -9,7 +9,11 @@ config() {
 }
 
 config etc/fwupd/daemon.conf.new
+if [ -e etc/fwupd/uefi.conf ] ; then
+  config etc/fwupd/uefi.conf.new
+fi
 config etc/fwupd/remotes.d/fwupd.conf.new
+config etc/fwupd/remotes.d/fwupd-tests.conf.new
 config etc/fwupd/remotes.d/lvfs-testing.conf.new
 config etc/fwupd/remotes.d/lvfs.conf.new
 config etc/fwupd/remotes.d/vendor.conf.new
diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild
index 9c1ed23baf..92d69114f3 100644
--- a/system/fwupd/fwupd.SlackBuild
+++ b/system/fwupd/fwupd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fwupd
 
-# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fwupd
-VERSION=${VERSION:-1.1.4}
+VERSION=${VERSION:-1.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -100,10 +100,14 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mv $PKG/etc/fwupd/daemon.conf $PKG/etc/fwupd/daemon.conf.new
 mv $PKG/etc/fwupd/redfish.conf $PKG/etc/fwupd/redfish.conf.new
 mv $PKG/etc/fwupd/remotes.d/fwupd.conf $PKG/etc/fwupd/remotes.d/fwupd.conf.new
+mv $PKG/etc/fwupd/remotes.d/fwupd-tests.conf $PKG/etc/fwupd/remotes.d/fwupd-tests.conf.new
 mv $PKG/etc/fwupd/remotes.d/lvfs-testing.conf $PKG/etc/fwupd/remotes.d/lvfs-testing.conf.new
 mv $PKG/etc/fwupd/remotes.d/lvfs.conf $PKG/etc/fwupd/remotes.d/lvfs.conf.new
 mv $PKG/etc/fwupd/remotes.d/vendor.conf $PKG/etc/fwupd/remotes.d/vendor.conf.new
-mv $PKG/etc/fwupd/uefi.conf $PKG/etc/fwupd/uefi.conf.new
+
+if [ -e $PKG/etc/fwupd/uefi.conf ] ; then
+  mv $PKG/etc/fwupd/uefi.conf $PKG/etc/fwupd/uefi.conf.new
+fi
 
 mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new
 mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
@@ -115,9 +119,12 @@ mv $PKG/etc/pki/fwupd/LVFS-CA.pem $PKG/etc/pki/fwupd/LVFS-CA.pem.new
 
 rm -rf $PKG/usr/share/installed-tests
 
+mkdir -p $PKG/usr/share/dbus-1/system-services
+sed 's|@libexecdir@|/usr/libexec|' data/org.freedesktop.fwupd.service.in > $PKG/usr/share/dbus-1/system-services/org.freedesktop.fwupd.service
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS CODE_OF_CONDUCT.md CONTRIBUTING.md COPYING MAINTAINERS NEWS README.md RELEASE \
+  AUTHORS CODE_OF_CONDUCT.md COMMITMENT CONTRIBUTING.md COPYING MAINTAINERS README.md RELEASE \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info
index bfe0ae793f..4348d3f54f 100644
--- a/system/fwupd/fwupd.info
+++ b/system/fwupd/fwupd.info
@@ -1,10 +1,10 @@
 PRGNAM="fwupd"
-VERSION="1.1.4"
+VERSION="1.2.3"
 HOMEPAGE="https://www.fwupd.org"
-DOWNLOAD="https://github.com/hughsie/fwupd/archive/1.1.4/fwupd-1.1.4.tar.gz"
-MD5SUM="e29a13ef041ecd861246aca9fb721dc7"
+DOWNLOAD="https://github.com/hughsie/fwupd/archive/1.2.3/fwupd-1.2.3.tar.gz"
+MD5SUM="1efff93e3399ebd8c75022f4f1487586"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="appstream-glib libgusb efivar"
+REQUIRES="libxmlb libgusb efivar json-glib gcab"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"
-- 
cgit v1.2.3