From c1a1f3d6f705a10f9ccba9ba422f6afc51fa3afa Mon Sep 17 00:00:00 2001
From: Andrew Clemons <andrew.clemons@gmail.com>
Date: Sat, 14 Oct 2017 09:42:44 +0100
Subject: system/fwupd: Updated for version 1.0.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/fwupd/doinst.sh        |  5 ++++-
 system/fwupd/fwupd.SlackBuild | 12 +++++++-----
 system/fwupd/fwupd.info       |  6 +++---
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'system')

diff --git a/system/fwupd/doinst.sh b/system/fwupd/doinst.sh
index 7fb85f61a3..2adacc1286 100644
--- a/system/fwupd/doinst.sh
+++ b/system/fwupd/doinst.sh
@@ -8,11 +8,14 @@ config() {
   fi
 }
 
-config etc/fwupd.conf.new
+config etc/fwupd/daemon.conf.new
 config etc/fwupd/remotes.d/fwupd.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
+
 config etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
+config etc/pki/fwupd-metadata/LVFS-CA.pem.new
 config etc/pki/fwupd/GPG-KEY-Hughski-Limited.new
 config etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new
+config etc/pki/fwupd/LVFS-CA.pem.new
diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild
index c9b8ab66ec..7513c03205 100644
--- a/system/fwupd/fwupd.SlackBuild
+++ b/system/fwupd/fwupd.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fwupd
-VERSION=${VERSION:-0.9.7}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ ENABLE_DELL=${ENABLE_DELL:-false}
 ENABLE_UEFI=${ENABLE_UEFI:-false}
 ENABLE_UEFI_LABELS=${ENABLE_UEFI_LABELS:-false}
 
-# libelf is disable because meson seems unable to find it on slack
+# altos is disable because meson seems unable to find libelf on slack.
 # tbtfwu is not packaged on slackbuilds.org
 
 CFLAGS="$SLKCFLAGS" \
@@ -87,7 +87,7 @@ meson --prefix=/usr \
   --buildtype=release \
   --mandir=/usr/man \
   -Denable-systemd=false \
-  -Denable-libelf=false \
+  -Denable-altos=false \
   -Denable-tbtfwu=false \
   -Denable-colorhug=$ENABLE_COLORHUG \
   -Denable-uefi=$ENABLE_UEFI \
@@ -105,21 +105,23 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mv $PKG/etc/fwupd.conf $PKG/etc/fwupd.conf.new
+mv $PKG/etc/fwupd/daemon.conf $PKG/etc/fwupd/daemon.conf.new
 mv $PKG/etc/fwupd/remotes.d/fwupd.conf $PKG/etc/fwupd/remotes.d/fwupd.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/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new
+mv $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem.new
 mv $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited.new
 mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new
+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/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING MAINTAINERS NEWS README.md RELEASE \
+  AUTHORS CODE_OF_CONDUCT.md CONTRIBUTING.md COPYING MAINTAINERS NEWS 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 c47a35b17b..340349a317 100644
--- a/system/fwupd/fwupd.info
+++ b/system/fwupd/fwupd.info
@@ -1,8 +1,8 @@
 PRGNAM="fwupd"
-VERSION="0.9.7"
+VERSION="1.0.0"
 HOMEPAGE="http://www.fwupd.org"
-DOWNLOAD="https://github.com/hughsie/fwupd/archive/0.9.7/fwupd-0.9.7.tar.gz"
-MD5SUM="79db1aa9ca53df90853d52eefac40851"
+DOWNLOAD="https://github.com/hughsie/fwupd/archive/1.0.0/fwupd-1.0.0.tar.gz"
+MD5SUM="66177db1459597502f86a6f1aac54335"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="appstream-glib libgusb"
-- 
cgit v1.2.3