final touches on fedora34 build target

.gitignore

@@ -15,6 +15,6 @@
 build_tag
 /docker/librewolf/debian10/deb/artifacts
 /docker/librewolf/debian11/deb/artifacts
-/docker/librewolf/fedora/rpm/artifacts
+/docker/librewolf/fedora34/rpm/artifacts
 /docker/librewolf/mint20/deb/artifacts
 /docker/librewolf/ubuntu20/deb/artifacts

docker/Makefile

@@ -2,7 +2,7 @@ all : lw
 
 help :
 	@echo "Use: make all clean lw prune mozilla full"
-	@echo "     make debian fedora mint ubuntu"
+	@echo "     make debian10 debian11 fedora34 mint20 ubuntu20"
 
 clean :
 	rm -f librewolf/version release/version
@@ -38,10 +38,10 @@ debian11 :
 	make -C buildenv/debian11
 	cp version librewolf/debian11
 	make -C librewolf/debian11
-fedora :
+fedora34 :
-	make -C buildenv/fedora
+	make -C buildenv/fedora34
-	cp version librewolf/fedora
+	cp version librewolf/fedora34
-	make -C librewolf/fedora
+	make -C librewolf/fedora34
 mint20 :
 	make -C buildenv/mint20
 	cp version librewolf/mint20
@@ -59,7 +59,7 @@ low_disk :
 	make prune
 	make debian11
 	make prune
-	make fedora
+	make fedora34
 	make prune
 	make mint20
 	make prunt

docker/buildenv/Makefile

@@ -1,6 +1,6 @@
 all :
 	make -C debian10
 	make -C debian11
-	make -C fedora
+	make -C fedora34
 	make -C mint20
 	make -C ubuntu20

docker/buildenv/fedora/Makefile

@@ -1,2 +0,0 @@
-all :
-	sudo docker build -t mozilla/buildenv-fedora .

docker/buildenv/fedora34/Makefile

@@ -0,0 +1,2 @@
+all :
+	sudo docker build -t mozilla/buildenv-fedora34 .

docker/librewolf/Makefile

@@ -3,7 +3,7 @@
 all :
 
 	cp ../version .
-	cp version debian10/version && cp version debian11/version && cp version fedora/version && cp version ubuntu20/version && cp version mint20/version && cp version arch && cp version macos && cp version windows && cp version portable-linux
+	cp version debian10/version && cp version debian11/version && cp version fedora34/version && cp version ubuntu20/version && cp version mint20/version && cp version arch && cp version macos && cp version windows && cp version portable-linux
 
 	make -C arch
 	make -C macos
@@ -12,17 +12,17 @@ all :
 
 	make -C debian10
 	make -C debian11
-	make -C fedora
+	make -C fedora34
 	make -C mint20
 	make -C ubuntu20
 
 
 clean :
-	rm -f version debian10/version debian11/version fedora/version ubuntu20/version mint20/version arch/version macos/version windows/version portable-linux/version
+	rm -f version debian10/version debian11/version fedora34/version ubuntu20/version mint20/version arch/version macos/version windows/version portable-linux/version
 	make -C portable-linux clean
 	make -C debian10 clean
 	make -C debian11 clean
-	make -C fedora clean
+	make -C fedora34 clean
 	make -C mint20 clean
 	make -C ubuntu20 clean
 
@@ -30,8 +30,8 @@ build.debian10 :
 	make -C debian10
 build.debian11 :
 	make -C debian11
-build.fedora :
+build.fedora34 :
-	make -C fedora
+	make -C fedora34
 build.mint20 :
 	make -C mint20
 build.ubuntu :

docker/librewolf/fedora/Makefile

@@ -1,10 +0,0 @@
-all :
-	sudo docker build -t librewolf/release-fedora .
-	make -C rpm all
-
-no-cache :
-	sudo docker build --no-cache -t librewolf/release-fedora .
-	make -C rpm no-cache
-
-clean :
-	make -C rpm clean

docker/librewolf/fedora34/Dockerfile

@@ -1,4 +1,4 @@
-from mozilla/buildenv-fedora
+from mozilla/buildenv-fedora34
 run rm -rf mozilla-unified
 
 # Build it..

docker/librewolf/fedora34/Makefile

@@ -0,0 +1,10 @@
+all :
+	sudo docker build -t librewolf/release-fedora34 .
+	make -C rpm all
+
+no-cache :
+	sudo docker build --no-cache -t librewolf/release-fedora34 .
+	make -C rpm no-cache
+
+clean :
+	make -C rpm clean

docker/librewolf/fedora34/rpm/Dockerfile

@@ -1,4 +1,4 @@
-from librewolf/release-fedora
+from librewolf/release-fedora34
 
 run ./build.py --version $(cat /version) lw_artifacts
 run mkdir /artifacts

docker/librewolf/fedora34/rpm/Makefile

@@ -1,7 +1,7 @@
-distro = fedora
+distro = fedora34
-extractor = extract1
+extractor = extract12
 docker_stage = rpm-$(distro)
-version = `cat version`
+version = `cat ../version`
 
 
 all : cache
@@ -31,6 +31,6 @@ artifacts/build_tag :
 	sudo docker rm $(extractor)
 	sudo mv -v artifacts/librewolf-$(version).en-US.rpm.zip artifacts/librewolf-$(version).en-US.$(distro).zip 
 	sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip 
-	sudo chown user:user artifacts/librewolf-$(version)-1.fc34.x86_64.rpm
+	sudo chown user:user artifacts/librewolf-$(version)*.rpm
-	scp artifacts/*.rpm vps:pub/pub/librewolf
+	scp artifacts/librewolf-$(version)*.rpm vps:pub/pub/librewolf
 

docker/librewolf/fedora34/rpm/build-rpm.sh

@@ -57,5 +57,7 @@ echo '---'
 echo "[debug] Running rpmbuild.."
 echo '---'
 
-rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec
+rpmbuild -v -ba $(pwd)/rpmbuild/SPECS/librewolf.spec
+echo '--- [debug] Copying output files to /artifacts'
 cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm /artifacts
+cp -v ~/rpmbuild/SRPMS/librewolf-*.rpm /artifacts