Merge branch 'master' of gitlab.com:librewolf-community/browser/windows

docker/librewolf/fedora/rpm/Dockerfile

@@ -1,9 +1,14 @@
-from librewolf/release-debian
+from librewolf/release-fedora
+
 run ./build.py --version $(cat /version) lw_artifacts
 run mkdir /artifacts
-run cp librewolf-$(cat /version).en-US.deb.zip /artifacts
+run cp librewolf-$(cat /version).en-US.rpm.zip /artifacts
 
+run sudo dnf -y install rpm-build
 
+workdir /root
+copy build-rpm.sh .
+copy librewolf.spec .
+run ./build-rpm.sh
 
-# Sending termination shock signal.
 run rm -f /artifacts/build_tag && date > /artifacts/build_tag

docker/librewolf/fedora/rpm/Makefile

@@ -1,11 +1,14 @@
 distro = fedora
 extractor = extract1
 docker_stage = rpm-$(distro)
-version = `cat ../version`
+version = `cat version`
 
 
 all : cache
 
+clean :
+	sudo rm -f build_tag artifacts/build_tag
+
 cache :
 	sudo docker build -t librewolf/$(docker_stage) .
 	make get_zip
@@ -14,6 +17,8 @@ no-cache :
 	sudo docker build --no-cache -t librewolf/$(docker_stage) .
 	make get_zip
 
+dist : clean get_zip
+
 get_zip : build_tag
 
 build_tag : artifacts/build_tag
@@ -24,9 +29,9 @@ artifacts/build_tag :
 	sudo rm -rf artifacts
 	sudo docker cp $(extractor):/artifacts .
 	sudo docker rm $(extractor)
-	sudo mv -v artifacts/librewolf-$(version).en-US.deb.zip artifacts/librewolf-$(version).en-US.$(distro).zip 
+	sudo mv -v artifacts/librewolf-$(version).en-US.rpm.zip artifacts/librewolf-$(version).en-US.$(distro).zip 
-#	sudo mv -v artifacts/librewolf.deb artifacts/librewolf-$(version).en-US.$(distro).deb 
+	sudo mv -v artifacts/librewolf-$(version)-1.x86_64.fc34.rpm artifacts/librewolf-$(version).en-US.$(distro).rpm 
 	sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip 
-#	sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).deb
+	sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).rpm
-#	scp artifacts/*.deb vps:pub/pub/librewolf
+	scp artifacts/*.rpm vps:pub/pub/librewolf
 

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

@@ -0,0 +1,38 @@
+version=$(cat version)
+
+rm -rf rpmbuild
+mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+
+sed "s/__VERSION__/$version/g" < librewolf.spec > rpmbuild/SPECS/librewolf.spec
+
+cp -v artifacts/librewolf-$version.en-US.fedora.zip rpmbuild/SOURCES/librewolf.zip
+cd rpmbuild/SOURCES
+
+unzip librewolf.zip
+rm librewolf.zip
+
+mkdir -p librewolf-$version/usr/share/librewolf
+mkdir -p librewolf-$version/usr/bin
+
+mv -v librewolf/* librewolf-$version/usr/share/librewolf
+rmdir librewolf
+cd librewolf-$version/usr/bin
+ln -s ../share/librewolf/librewolf
+cd ../../..
+
+tar cvfz lw.tar.gz librewolf-$version
+
+cd librewolf-$version
+find . > ../../../lw-dir.txt
+cd ..
+
+rm -rf lw
+cd ../..
+
+rm -rf ~/rpmbuild
+cp -rv rpmbuild ~
+
+# Build the package!
+echo "[debug] Running rpmbuild.."
+rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec
+cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm artifacts

docker/librewolf/fedora/rpm/librewolf.spec

@@ -0,0 +1,66 @@
+Name:           librewolf
+Version:        __VERSION__
+Release:        1%{?dist}
+BuildArch:      x86_64
+Summary:        The LibreWolf browser
+License:        MPL
+URL:            https://librewolf-community.gitlab.io/
+Source0:        lw.tar.gz
+#BuildRequires:  
+#Requires:       
+%description
+The LibreWolf browser for privacy, with uBlock and tweaked settings.
+
+%prep
+%setup -q
+
+%install
+mkdir -p "$RPM_BUILD_ROOT"
+cp -rv * "$RPM_BUILD_ROOT"
+
+%files
+/usr/share/librewolf/application.ini
+/usr/share/librewolf/browser/chrome/icons/default/default128.png
+/usr/share/librewolf/browser/chrome/icons/default/default16.png
+/usr/share/librewolf/browser/chrome/icons/default/default32.png
+/usr/share/librewolf/browser/chrome/icons/default/default48.png
+/usr/share/librewolf/browser/chrome/icons/default/default64.png
+/usr/share/librewolf/browser/features/formautofill@mozilla.org.xpi
+/usr/share/librewolf/browser/features/pictureinpicture@mozilla.org.xpi
+/usr/share/librewolf/browser/features/screenshots@mozilla.org.xpi
+/usr/share/librewolf/browser/omni.ja
+/usr/share/librewolf/defaults/pref/channel-prefs.js
+/usr/share/librewolf/dependentlibs.list
+/usr/share/librewolf/distribution/policies.json
+/usr/share/librewolf/fonts/TwemojiMozilla.ttf
+/usr/share/librewolf/gmp-clearkey/0.1/libclearkey.so
+/usr/share/librewolf/gmp-clearkey/0.1/manifest.json
+/usr/share/librewolf/libfreeblpriv3.so
+/usr/share/librewolf/liblgpllibs.so
+/usr/share/librewolf/libmozavcodec.so
+/usr/share/librewolf/libmozavutil.so
+/usr/share/librewolf/libmozgtk.so
+/usr/share/librewolf/libmozsandbox.so
+/usr/share/librewolf/libmozsqlite3.so
+/usr/share/librewolf/libmozwayland.so
+/usr/share/librewolf/libnspr4.so
+/usr/share/librewolf/libnss3.so
+/usr/share/librewolf/libnssckbi.so
+/usr/share/librewolf/libnssutil3.so
+/usr/share/librewolf/libplc4.so
+/usr/share/librewolf/libplds4.so
+/usr/share/librewolf/librewolf
+/usr/share/librewolf/librewolf-bin
+/usr/share/librewolf/librewolf.cfg
+/usr/share/librewolf/librewolf.ico
+/usr/share/librewolf/libsmime3.so
+/usr/share/librewolf/libsoftokn3.so
+/usr/share/librewolf/libssl3.so
+/usr/share/librewolf/libxul.so
+/usr/share/librewolf/omni.ja
+/usr/share/librewolf/platform.ini
+/usr/share/librewolf/plugin-container
+/usr/share/librewolf/register-librewolf
+/usr/share/librewolf/start-librewolf
+/usr/share/librewolf/start-librewolf.desktop.in
+/usr/bin/librewolf