Updating Fedora versions to 38 & 39 (#91)

Dockerfile.fedora

@@ -1,4 +1,4 @@
-ARG tag=33
+ARG tag=38
 
 FROM fedora:${tag} AS rpm-builder
 

Makefile

@@ -20,16 +20,13 @@ windows: bin/windows/baronial.exe
 docker: bin/docker/baronial-alpine.tar.gz bin/docker/baronial-debian.tar.gz bin/docker/baronial-fedora33.tar.gz bin/docker/baronial-fedora34.tar.gz bin/docker/baronial-el8.tar.gz
 
 .PHONY: fedora
-fedora: fedora33 fedora34 fedora35
+fedora: fedora38 fedora39
 
-.PHONY: fedora33
-fedora33: bin/linux/baronial.fc33.src.rpm bin/linux/baronial.fc33.x86_64.rpm bin/docker/baronial-fedora33.tar.gz
+.PHONY: fedora38
+fedora38: bin/linux/baronial.fc38.src.rpm bin/linux/baronial.fc38.x86_64.rpm bin/docker/baronial-fedora38.tar.gz
 
-.PHONY: fedora34
-fedora34: bin/linux/baronial.fc34.src.rpm bin/linux/baronial.fc34.x86_64.rpm bin/docker/baronial-fedora34.tar.gz
-
-.PHONY: fedora35
-fedora35: bin/linux/baronial.fc35.src.rpm bin/linux/baronial.fc35.x86_64.rpm bin/docker/baronial-fedora35.tar.gz
+.PHONY: fedora39
+fedora39: bin/linux/baronial.fc39.src.rpm bin/linux/baronial.fc39.x86_64.rpm bin/docker/baronial-fedora39.tar.gz
 
 .PHONY: el8
 el8: bin/linux/baronial.el8.src.rpm bin/linux/baronial.el8.x86_64.rpm bin/docker/baronial-el8.tar.gz
@@ -41,7 +38,7 @@ opensuse: bin/linux/baronial.lp153.src.rpm bin/linux/baronial.lp153.x86_64.rpm b
 alpine: bin/docker/baronial-alpine.tar.gz
 
 .PHONY: rpm
-rpm: bin/linux/baronial.fc33.src.rpm bin/linux/baronial.fc34.x86_64.rpm bin/linux/baronial.fc33.src.rpm bin/linux/baronial.fc34.x86_64.rpm bin/linux/baronial.lp151.src.rpm bin/linux/baronial.lp151.x86_64.rpm bin/linux/baronial.el8.x86_64.rpm bin/linux/baronial.el8.src.rpm
+rpm: bin/linux/baronial.fc38.src.rpm bin/linux/baronial.fc39.x86_64.rpm bin/linux/baronial.fc38.src.rpm bin/linux/baronial.fc39.x86_64.rpm bin/linux/baronial.lp151.src.rpm bin/linux/baronial.lp151.x86_64.rpm bin/linux/baronial.el8.x86_64.rpm bin/linux/baronial.el8.src.rpm
 
 version.txt: ${SRC} go.sum
 	perl ./get-version.pl > version.txt
@@ -81,47 +78,33 @@ bin/docker/baronial-debian.tar.gz: ${SRC} Dockerfile.debian
 	${DOCKER} build -t marstr/baronial:debian -f Dockerfile.debian .
 	${DOCKER} save marstr/baronial:debian | gzip > bin/docker/baronial-debian.tar.gz
 
-bin/docker/baronial-fedora33.tar.gz: ${SRC} Dockerfile.fedora
-	mkdir -p bin/docker
-	${DOCKER} build --build-arg tag=33 -t marstr/baronial:fedora33-rpm-builder -f Dockerfile.fedora --target rpm-builder .
-	${DOCKER} build --build-arg tag=33 -t marstr/baronial:fedora33 -f Dockerfile.fedora .
-	${DOCKER} save marstr/baronial:fedora31 | gzip > bin/docker/baronial-fedora33.tar.gz
-
-bin/linux/baronial.fc33.src.rpm: bin/docker/baronial-fedora33.tar.gz version.txt
-	mkdir -p bin/linux
-	${DOCKER} run --rm marstr/baronial:fedora33-rpm-builder cat /root/rpmbuild/SRPMS/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc33.src.rpm > bin/linux/baronial.fc33.src.rpm
-
-bin/linux/baronial.fc33.x86_64.rpm: bin/docker/baronial-fedora33.tar.gz version.txt
-	mkdir -p bin/linux
-	${DOCKER} run --rm marstr/baronial:fedora33-rpm-builder cat /root/rpmbuild/RPMS/x86_64/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc33.x86_64.rpm > bin/linux/baronial.fc33.x86_64.rpm
-
-bin/docker/baronial-fedora34.tar.gz: ${SRC} Dockerfile.fedora
+bin/docker/baronial-fedora38.tar.gz: ${SRC} Dockerfile.fedora
 	mkdir -p bin/docker
-	${DOCKER} build --build-arg tag=34 -t marstr/baronial:fedora34-rpm-builder -f Dockerfile.fedora --target rpm-builder .
-	${DOCKER} build --build-arg tag=34 -t marstr/baronial:fedora34 -f Dockerfile.fedora .
-	${DOCKER} save marstr/baronial:fedora34 | gzip > bin/docker/baronial-fedora34.tar.gz
+	${DOCKER} build --build-arg tag=38 -t marstr/baronial:fedora38-rpm-builder -f Dockerfile.fedora --target rpm-builder .
+	${DOCKER} build --build-arg tag=38 -t marstr/baronial:fedora38 -f Dockerfile.fedora .
+	${DOCKER} save marstr/baronial:fedora38 | gzip > bin/docker/baronial-fedora38.tar.gz
 
-bin/linux/baronial.fc34.src.rpm: bin/docker/baronial-fedora34.tar.gz version.txt
+bin/linux/baronial.fc38.src.rpm: bin/docker/baronial-fedora38.tar.gz version.txt
 	mkdir -p bin/linux
-	${DOCKER} run --rm marstr/baronial:fedora34-rpm-builder cat /root/rpmbuild/SRPMS/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc34.src.rpm > bin/linux/baronial.fc34.src.rpm
+	${DOCKER} run --rm marstr/baronial:fedora38-rpm-builder cat /root/rpmbuild/SRPMS/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc38.src.rpm > bin/linux/baronial.fc38.src.rpm
 
-bin/linux/baronial.fc34.x86_64.rpm: bin/docker/baronial-fedora34.tar.gz version.txt
+bin/linux/baronial.fc38.x86_64.rpm: bin/docker/baronial-fedora38.tar.gz version.txt
 	mkdir -p bin/linux
-	${DOCKER} run --rm marstr/baronial:fedora34-rpm-builder cat /root/rpmbuild/RPMS/x86_64/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc34.x86_64.rpm > bin/linux/baronial.fc34.x86_64.rpm
+	${DOCKER} run --rm marstr/baronial:fedora38-rpm-builder cat /root/rpmbuild/RPMS/x86_64/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc38.x86_64.rpm > bin/linux/baronial.fc38.x86_64.rpm
 
-bin/docker/baronial-fedora35.tar.gz: ${SRC} Dockerfile.fedora
+bin/docker/baronial-fedora39.tar.gz: ${SRC} Dockerfile.fedora
 	mkdir -p bin/docker
-	${DOCKER} build --build-arg tag=35 -t marstr/baronial:fedora35-rpm-builder -f Dockerfile.fedora --target rpm-builder .
-	${DOCKER} build --build-arg tag=35 -t marstr/baronial:fedora35 -f Dockerfile.fedora .
-	${DOCKER} save marstr/baronial:fedora35 | gzip > bin/docker/baronial-fedora35.tar.gz
+	${DOCKER} build --build-arg tag=39 -t marstr/baronial:fedora39-rpm-builder -f Dockerfile.fedora --target rpm-builder .
+	${DOCKER} build --build-arg tag=39 -t marstr/baronial:fedora39 -f Dockerfile.fedora .
+	${DOCKER} save marstr/baronial:fedora39 | gzip > bin/docker/baronial-fedora39.tar.gz
 
-bin/linux/baronial.fc35.src.rpm: bin/docker/baronial-fedora35.tar.gz version.txt
+bin/linux/baronial.fc39.src.rpm: bin/docker/baronial-fedora39.tar.gz version.txt
 	mkdir -p bin/linux
-	${DOCKER} run --rm marstr/baronial:fedora35-rpm-builder cat /root/rpmbuild/SRPMS/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc35.src.rpm > bin/linux/baronial.fc35.src.rpm
+	${DOCKER} run --rm marstr/baronial:fedora39-rpm-builder cat /root/rpmbuild/SRPMS/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc39.src.rpm > bin/linux/baronial.fc39.src.rpm
 
-bin/linux/baronial.fc35.x86_64.rpm: bin/docker/baronial-fedora35.tar.gz version.txt
+bin/linux/baronial.fc39.x86_64.rpm: bin/docker/baronial-fedora39.tar.gz version.txt
 	mkdir -p bin/linux
-	${DOCKER} run --rm marstr/baronial:fedora35-rpm-builder cat /root/rpmbuild/RPMS/x86_64/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc35.x86_64.rpm > bin/linux/baronial.fc35.x86_64.rpm
+	${DOCKER} run --rm marstr/baronial:fedora39-rpm-builder cat /root/rpmbuild/RPMS/x86_64/baronial-$$(cat ./version.txt | ./packaging/redhat/redhatify-version.pl)-1.fc39.x86_64.rpm > bin/linux/baronial.fc39.x86_64.rpm
 
 bin/docker/baronial-el8.tar.gz: ${SRC} Dockerfile.rhel
 	mkdir -p bin/docker