Switch contrib repository definitions to Qubes 4.0

debian/qubes-repo-contrib.install

@@ -1,2 +1,2 @@
-etc/apt/sources.list.d/qubes-contrib-r3.2.list
-etc/apt/trusted.gpg.d/qubes-3-contrib-keyring.gpg
+etc/apt/sources.list.d/qubes-contrib-r4.0.list
+etc/apt/trusted.gpg.d/qubes-4-contrib-keyring.gpg

repos/Makefile

@@ -1,19 +1,19 @@
 install-vm-debian:
 	install -d $(DESTDIR)/etc/apt/sources.list.d
-	sed -e "s/@DIST@/`lsb_release -cs`/" qubes-contrib-r3.2.list.in \
-		> $(DESTDIR)/etc/apt/sources.list.d/qubes-contrib-r3.2.list
+	sed -e "s/@DIST@/`lsb_release -cs`/" qubes-contrib-r4.0.list.in \
+		> $(DESTDIR)/etc/apt/sources.list.d/qubes-contrib-r4.0.list
 	install -d $(DESTDIR)/etc/apt/trusted.gpg.d
 	gpg --no-default-keyring --keyring \
-		$(DESTDIR)/etc/apt/trusted.gpg.d/qubes-3-contrib-keyring.gpg \
-		--import qubes-contrib-debian-3.asc
+		$(DESTDIR)/etc/apt/trusted.gpg.d/qubes-4-contrib-keyring.gpg \
+		--import qubes-contrib-debian-4.asc
 
 install-vm-fedora: install-fedora
 	install -d $(DESTDIR)/etc/yum.repos.d
-	install -m 0644 qubes-contrib-vm-r3.2.repo $(DESTDIR)/etc/yum.repos.d
+	install -m 0644 qubes-contrib-vm-r4.0.repo $(DESTDIR)/etc/yum.repos.d
 
 install-fedora:
 	install -d $(DESTDIR)/etc/pki/rpm-gpg/
-	install -m 0644 qubes-contrib-fedora-3.asc \
-		$(DESTDIR)/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-3-contrib
-	ln -s RPM-GPG-KEY-qubes-3-contrib \
-		$(DESTDIR)/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-3.2-contrib
+	install -m 0644 qubes-contrib-fedora-4.asc \
+		$(DESTDIR)/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-contrib
+	ln -s RPM-GPG-KEY-qubes-4-contrib \
+		$(DESTDIR)/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.0-contrib

repos/qubes-contrib-r4.0.list.in

@@ -0,0 +1,7 @@
+# Qubes contrib repository
+deb [arch=amd64] http://deb.qubes-os.org/r4.0-contrib/vm @DIST@ main
+#deb-src http://deb.qubes-os.org/r4.0-contrib/vm @DIST@ main
+
+# Qubes contrib updates testing repository
+#deb [arch=amd64] http://deb.qubes-os.org/r4.0-contrib/vm @DIST@-testing main
+#deb-src http://deb.qubes-os.org/r4.0-contrib/vm @DIST@-testing main

repos/qubes-contrib-vm-r4.0.repo

@@ -0,0 +1,13 @@
+[qubes-contrib-vm-r4.0-current]
+name = Qubes OS Contrib Repository for VM (updates)
+baseurl = http://yum.qubes-os.org/r4.0-contrib/current/vm/fc$releasever
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-contrib
+gpgcheck = 1
+enabled=1
+
+[qubes-contrib-vm-r4.0-current-testing]
+name = Qubes OS Contrib Repository for VM (updates-testing)
+baseurl = http://yum.qubes-os.org/r4.0-contrib/current-testing/vm/fc$releasever
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-contrib
+gpgcheck = 1
+enabled=0

rpm_spec/qubes-vm-meta-packages.spec

@@ -69,9 +69,9 @@ ln -sf . %{name}-%{version}
 make -C repos install-vm-fedora DESTDIR=$RPM_BUILD_ROOT
 
 %files -n qubes-repo-contrib
-%config(noreplace) /etc/yum.repos.d/qubes-contrib-vm-r3.2.repo
-/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-3.2-contrib
-/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-3-contrib
+%config(noreplace) /etc/yum.repos.d/qubes-contrib-vm-r4.0.repo
+/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.0-contrib
+/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4-contrib
 
 %files -n qubes-vm-dependencies