Merge pull request #126 from NERSC/scanon/fix_rpm_locations

Fix up RPM locations

.github/actions/build-podman-hpc/entrypoint.sh

@@ -2,9 +2,14 @@
 
 # build python packages
 DIST=dist
+pip3 install .
 python3 -m build --outdir $DIST
 
 # build SRPM and RPM
+OLD_VER=$(grep Version: podman-hpc.spec|sed 's/.* //')
+VER=$(grep __version__.= podman_hpc/podman_hpc.py|sed 's/.*=..//'|sed 's/.$//')
+sed -i "s/${OLD_VER}/${VER}/" podman-hpc.spec
+
 RPMBUILD_TOPDIR=$(rpmbuild --eval="%{_topdir}")
 cp $DIST/*.tar.gz $RPMBUILD_TOPDIR/SOURCES/
 rpmbuild -ba podman-hpc.spec

Makefile

@@ -11,10 +11,8 @@ build:
 	echo "Nothing to do"
 
 rpmbuild-install: 
-	python3 -m setup install --root=$(DESTDIR) --prefix=/usr
+	python3 -m setup install --root=$(DESTDIR) --prefix=/usr --install-data=/
 	python3 -m podman_hpc.configure_hooks \
 		--hooksd $(DESTDIR)/usr/share/containers/oci/hooks.d
-	mkdir -p $(DESTDIR)/etc/
-	ln -s ../usr/etc/podman_hpc $(DESTDIR)/etc/podman_hpc
 
 install: rpmbuild-install

podman-hpc.spec

@@ -14,7 +14,7 @@
 
 
 Name:           podman-hpc
-Version:        1.1.0
+Version:        1.1.1
 Release:        1
 Summary:	Scripts to enable Podman to run in an HPC environment
 # FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses
@@ -48,7 +48,6 @@ run fully unprivileged.
 %license LICENSE
 %doc CHANGELOG.md README.md
 %config /etc/podman_hpc
-%config /usr/etc/podman_hpc
 /usr/bin/podman-hpc
 /usr/bin/hook_tool
 /usr/bin/fuse-overlayfs-wrap