Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpm: rename qubes-core-vm to qubes-core-agent

Browse Source 
Rename it to match repository name and the same package in Debian.

QubesOS/qubes-issues#2771
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-29 03:24:07 +02:00
parent 4514500ee6
commit 029d207311
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.builder
View File

@ -1,5 +1,5 @@
ifeq ($(PACKAGE_SET),vm) ifeq ($(PACKAGE_SET),vm)
RPM_SPEC_FILES := rpm_spec/core-vm.spec \ RPM_SPEC_FILES := rpm_spec/core-agent.spec \
rpm_spec/core-vm-doc.spec rpm_spec/core-vm-doc.spec
ifneq ($(filter $(DISTRIBUTION), debian qubuntu),) ifneq ($(filter $(DISTRIBUTION), debian qubuntu),)

22
rpm_spec/core-vm.spec → rpm_spec/core-agent.spec
View File

@ -103,7 +103,7 @@ restore_units() { \
done \ done \
} \ } \
Name: qubes-core-vm Name: qubes-core-agent
Version: %{version} Version: %{version}
Release: 1%{dist} Release: 1%{dist}
Summary: The Qubes core files for VM Summary: The Qubes core files for VM
@ -159,6 +159,8 @@ Requires: python2-dnf-plugins-qubes-hooks
%endif %endif
Obsoletes: qubes-core-vm-kernel-placeholder <= 1.0 Obsoletes: qubes-core-vm-kernel-placeholder <= 1.0
Obsoletes: qubes-upgrade-vm < 3.2 Obsoletes: qubes-upgrade-vm < 3.2
Provides: qubes-core-vm = %{version}-%{release}
Obsoletes: qubes-core-vm < 4.0.0
BuildRequires: xen-devel BuildRequires: xen-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
BuildRequires: qubes-utils-devel >= 3.1.3 BuildRequires: qubes-utils-devel >= 3.1.3
@ -186,7 +188,7 @@ DNF plugin for Qubes specific post-installation actions:
%package -n qubes-nautilus %package -n qubes-nautilus
Summary: Qubes integration for Nautilus Summary: Qubes integration for Nautilus
Requires: qubes-core-vm Requires: qubes-core-agent
Requires: nautilus-python Requires: nautilus-python
%description -n qubes-nautilus %description -n qubes-nautilus
@ -567,9 +569,11 @@ Summary: Qubes unit files for SysV init style or upstart
License: GPL v2 only License: GPL v2 only
Group: Qubes Group: Qubes
Requires: upstart Requires: upstart
Requires: qubes-core-vm Requires: qubes-core-agent
Provides: qubes-core-vm-init-scripts Provides: qubes-core-agent-init-scripts
Conflicts: qubes-core-vm-systemd Conflicts: qubes-core-agent-systemd
Provides: qubes-core-vm-sysvinit = %{version}-%{release}
Obsoletes: qubes-core-vm-sysvinit < 4.0.0
%description sysvinit %description sysvinit
The Qubes core startup configuration for SysV init (or upstart). The Qubes core startup configuration for SysV init (or upstart).
@ -638,9 +642,11 @@ Requires: systemd
Requires(post): systemd-units Requires(post): systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
Requires(postun): systemd-units Requires(postun): systemd-units
Requires: qubes-core-vm Requires: qubes-core-agent
Provides: qubes-core-vm-init-scripts Provides: qubes-core-agent-init-scripts
Conflicts: qubes-core-vm-sysvinit Conflicts: qubes-core-agent-sysvinit
Provides: qubes-core-vm-systemd = %{version}-%{release}
Obsoletes: qubes-core-vm-systemd < 4.0.0
%description systemd %description systemd
The Qubes core startup configuration for SystemD init. The Qubes core startup configuration for SystemD init.