Packaging updated test of packaging reflecting packagename=hardinfo2

1 files changed, 18 insertions, 15 deletions

diff --git a/tools/create_fedora_source.sh b/tools/create_fedora_source.sh
index 2b68e698..6dc1f860 100755
--- a/tools/create_fedora_source.sh
+++ b/tools/create_fedora_source.sh
@@ -1,36 +1,39 @@
 #!/bin/bash
 VERSION=$(cat ../CMakeLists.txt |grep set\(HARDINFO2_VERSION|cut -d '"' -f 2)
+ARCH=$(uname -m)
+DIST=$(uname -r|cut -d '.' -f 4)
+
+#clean and prep
+yum -y install ninja-build
 cd ..
 rm -rf build
-sudo yum -y remove hardinfo
+sudo yum -y remove hardinfo2
 rm -rf ~/rpmbuild
 
+#build source
 mkdir build
 cd build
 cmake -DDISTRO=src ..
-cp ../tools/hardinfo.spec .
+#fix for local build
+cat ../tools/hardinfo2.spec |grep -v Patch|sed '/URL:/c\URL:            ./'|sed '/Source0:/c\Source0:        hardinfo2-%{version}.tar.gz' |sed 's/hardinfo2-release/hardinfo2/g' >./hardinfo2.spec
 make package_source
-#cp _CPack_Packages/Linux-Source/RPM/SPECS/hardinfo.spec .
+
+cp -f ../tools/hardinfo2.spec .
 
 echo "Fedora Source Package Files ready in build:"
-ls -l hardinfo-$VERSION*.src.rpm
-ls -l hardinfo.spec
+ls -l hardinfo2-$VERSION*.src.rpm
+ls -l hardinfo2.spec
 
-#exit
 sleep 3
 
-#checking
-#fedpkg --release f39 lint
-
 #install src package
-sudo rpm --nomd5 -i ./hardinfo-$VERSION-1.src.rpm
-#cp -r ../tools/hardinfo.spec ~/rpmbuild/SPECS/
+sudo rpm --nomd5 -i ./hardinfo2-$VERSION-1.$DIST.src.rpm
 
 #create package from srpm
 cd ~/rpmbuild/SPECS
-rpmbuild -ba hardinfo.spec
+rpmbuild -ba hardinfo2.spec
 
 echo "Fedora binary build from Source Package Files ready:"
-ls -l ~/rpmbuild/RPMS/*
-sudo yum -y install ~/rpmbuild/RPMS/hardinfo-$VERSION*
-yum info hardinfo
+ls -l ~/rpmbuild/RPMS/$ARCH/*
+sudo yum -y install ~/rpmbuild/RPMS/$ARCH/hardinfo2-$VERSION*
+yum info hardinfo2