From 3d5be4afb65018c2cc4f7db446787428a9648d71 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Fri, 18 Dec 2020 20:22:24 +0100 Subject: [PATCH] Fix rpm spec template --- packaging_scripts/alien.sh | 7 ++++++- rpm/wireguide-TEMPLATE.spec | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packaging_scripts/alien.sh b/packaging_scripts/alien.sh index 1e0bef1..938f575 100755 --- a/packaging_scripts/alien.sh +++ b/packaging_scripts/alien.sh @@ -4,7 +4,10 @@ BASEDIR=~/sources # Version of wireguide VERSION=$(awk -F '"' '/self.version =/ {print $2}' ${BASEDIR}/wireguide/src/wireguide) -cd ~/sources +cd ${BASEDIR} + +# Import signing key +sudo rpm --import ${BASEDIR}/repo/debian/PUBLIC.KEY # Convert deb to rpm sudo alien -g -r ${BASEDIR}/wireguide_${VERSION}_all.deb @@ -19,5 +22,7 @@ sed "s/##VERSION##/${VERSION}/" ${BASEDIR}/wireguide/rpm/wireguide-TEMPLATE.spec cd wireguide-${VERSION} # Build rpm +cp ${BASEDIR}/wireguide/rpm/macros ~/.rpmmacros sudo rpmbuild --buildroot=$(pwd) -bb wireguide-${VERSION}.spec sudo chown ${USER}:${USER} ${BASEDIR}/wireguide-${VERSION}.noarch.rpm +rpm --addsign ${BASEDIR}/wireguide-${VERSION}.noarch.rpm diff --git a/rpm/wireguide-TEMPLATE.spec b/rpm/wireguide-TEMPLATE.spec index f54d9b9..a070ad8 100644 --- a/rpm/wireguide-TEMPLATE.spec +++ b/rpm/wireguide-TEMPLATE.spec @@ -4,10 +4,10 @@ Version: ##VERSION## Release: 1 Requires: python3-wxpython4 Summary: WireGUIde is a graphical user interface for WireGuard -License: GPL3+ +License: GPLv3+ Distribution: Fedora -Group: Converted/net +%define _binary_filedigest_algorithm 2 %define _rpmdir ../ %define _rpmfilename %%{NAME}-%%{VERSION}.noarch.rpm %define _unpackaged_files_terminate_build 0