diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2da368f..c831cc9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ include: - project: 'QubesOS/qubes-continuous-integration' - file: '/r4.1/gitlab-base.yml' + file: '/r4.3/gitlab-base.yml' - project: 'QubesOS/qubes-continuous-integration' - file: '/r4.1/gitlab-dom0-qwt.yml' + file: '/r4.3/gitlab-host.yml' diff --git a/.qubesbuilder b/.qubesbuilder new file mode 100644 index 0000000..882d1ae --- /dev/null +++ b/.qubesbuilder @@ -0,0 +1,4 @@ +host: + rpm: + build: + - rpm_spec/win-iso.spec diff --git a/qubes-windows-tools-4.1.0.exe b/qubes-windows-tools-4.1.0.exe new file mode 100644 index 0000000..08b400d Binary files /dev/null and b/qubes-windows-tools-4.1.0.exe differ diff --git a/rel b/rel index 00750ed..49d5957 100644 --- a/rel +++ b/rel @@ -1 +1 @@ -3 +0.1 diff --git a/rpm_spec/win-iso.spec.in b/rpm_spec/win-iso.spec.in index aa61c7f..c718453 100644 --- a/rpm_spec/win-iso.spec.in +++ b/rpm_spec/win-iso.spec.in @@ -2,18 +2,18 @@ Name: qubes-windows-tools Version: @VERSION@ -Release: @REL@ +Release: @REL@%{?dist} Summary: Qubes Tools for Windows VMs Group: Qubes License: GPL -Obsoletes: qubes-core-dom0-pvdrivers BuildRequires: genisoimage BuildArch: noarch -Source0: qubes-tools-WIN7x64-%{version}.%{release}.exe -Source1: iso-README.txt +Source0: %{name}-%{version}.tar.gz +Source1: qubes-windows-tools-4.1.0.exe +Source2: iso-README.txt %prep -%setup -c -T +%setup -q %description PV Drivers and Qubes Tools for Windows AppVMs. Bundled for Windows 7 64bit. @@ -21,8 +21,8 @@ PV Drivers and Qubes Tools for Windows AppVMs. Bundled for Windows 7 64bit. %build mkdir -p iso-content -cp %{SOURCE0} iso-content/qubes-tools-%{version}.%{release}.exe -cp %{SOURCE1} iso-content/ +cp %{SOURCE1} iso-content/qubes-tools-%{version}.%{release}.exe +cp %{SOURCE2} iso-content/ genisoimage -o qubes-windows-tools-%{version}.%{release}.iso -m .gitignore -JR iso-content @@ -36,4 +36,4 @@ ln -s qubes-windows-tools-%{version}.%{release}.iso $RPM_BUILD_ROOT/usr/lib/qube /usr/lib/qubes/qubes-windows-tools.iso %changelog - +@CHANGELOG@ diff --git a/version b/version index 1454f6e..8089590 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.0.1 +4.3.0