diff --git a/Makefile b/Makefile index de3fc63..f6d7c33 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,7 @@ install-vm: install -m 0644 vm-systemd/chronyd.service $(DESTDIR)/usr/lib/qubes/init/ install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes - install -D -m 0644 misc/qubes-r2-beta2.repo $(DESTDIR)/etc/yum.repos.d/qubes-r2-beta2.repo - install -D -m 0644 misc/qubes-r2-beta3.repo $(DESTDIR)/etc/yum.repos.d/qubes-r2-beta3.repo + install -D -m 0644 misc/qubes-r2.repo $(DESTDIR)/etc/yum.repos.d/qubes-r2.repo install -D -m 0644 misc/serial.conf $(DESTDIR)/usr/share/qubes/serial.conf install -D misc/qubes-serial-login $(DESTDIR)/$(SBINDIR)/qubes-serial-login install -d $(DESTDIR)/usr/share/glib-2.0/schemas/ diff --git a/misc/qubes-r2-beta2.repo b/misc/qubes-r2-beta2.repo deleted file mode 100644 index 380f7e4..0000000 --- a/misc/qubes-r2-beta2.repo +++ /dev/null @@ -1,21 +0,0 @@ -[qubes-vm-r2b2-current] -name = Qubes OS Repository for VM (updates) -baseurl = http://yum.qubes-os.org/r2-beta2/current/vm/fc$releasever -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-primary -gpgcheck = 1 -enabled=0 - -[qubes-vm-r2b2-current-testing] -name = Qubes OS Repository for VM (updates-testing) -baseurl = http://yum.qubes-os.org/r2-beta2/current-testing/vm/fc$releasever -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-primary -gpgcheck = 1 -enabled=0 - -[qubes-vm-r2b2-unstable] -name = Qubes OS Repository for VM (unstable) -baseurl = http://yum.qubes-os.org/r2-beta2/unstable/vm/fc$releasever -gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-unstable -gpgcheck = 1 -enabled=0 - diff --git a/misc/qubes-r2-beta3.repo b/misc/qubes-r2.repo similarity index 56% rename from misc/qubes-r2-beta3.repo rename to misc/qubes-r2.repo index d2fcf1d..898cafd 100644 --- a/misc/qubes-r2-beta3.repo +++ b/misc/qubes-r2.repo @@ -1,19 +1,19 @@ -[qubes-vm-r2b3-current] +[qubes-vm-r2-current] name = Qubes OS Repository for VM (updates) -baseurl = http://yum.qubes-os.org/r2-beta3/current/vm/fc$releasever +baseurl = http://yum.qubes-os.org/r2/current/vm/fc$releasever gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-primary gpgcheck = 1 -[qubes-vm-r2b3-current-testing] +[qubes-vm-r2-current-testing] name = Qubes OS Repository for VM (updates-testing) -baseurl = http://yum.qubes-os.org/r2-beta3/current-testing/vm/fc$releasever +baseurl = http://yum.qubes-os.org/r2/current-testing/vm/fc$releasever gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-primary gpgcheck = 1 enabled=0 -[qubes-vm-r2b3-unstable] +[qubes-vm-r2-unstable] name = Qubes OS Repository for VM (unstable) -baseurl = http://yum.qubes-os.org/r2-beta3/unstable/vm/fc$releasever +baseurl = http://yum.qubes-os.org/r2/unstable/vm/fc$releasever gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-2-unstable gpgcheck = 1 enabled=0 diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 731fea6..48d33e4 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -323,8 +323,7 @@ rm -f %{name}-%{version} /etc/xdg/nautilus-actions/nautilus-actions.conf /etc/xen/scripts/vif-route-qubes %config(noreplace) /etc/yum.conf.d/qubes-proxy.conf -%config(noreplace) /etc/yum.repos.d/qubes-r2-beta2.repo -%config(noreplace) /etc/yum.repos.d/qubes-r2-beta3.repo +%config(noreplace) /etc/yum.repos.d/qubes-r2.repo /etc/yum/pluginconf.d/yum-qubes-hooks.conf /etc/yum/post-actions/qubes-trigger-sync-appmenus.action /usr/sbin/qubes-serial-login