From 3418d5acbc6215c8c176e0251ecc6bb68f329690 Mon Sep 17 00:00:00 2001
From: unman <unman@thirdeyesecurity.org>
Date: Sat, 21 May 2022 14:36:56 +0000
Subject: [PATCH] Standardise package names

---
 cacher.spec     | 6 ++++--
 gpg.spec        | 4 +++-
 multimedia.spec | 7 +++++--
 print.spec      | 6 ++++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cacher.spec b/cacher.spec
index 32146c4..5e9a7ae 100644
--- a/cacher.spec
+++ b/cacher.spec
@@ -1,5 +1,5 @@
-Name:           cacher
-Version:       	1.3
+Name:           3isec-qubes-cacher
+Version:       	1.4
 Release:        1%{?dist}
 Summary:        Salt a caching proxy in Qubes
 
@@ -41,6 +41,8 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
+* Sat May 21 2022 unman <unman@thirdeyesecurity.org> - 1.4
+- Standardise package names to 3isec-
 * Sun May 15 2022 unman <unman@thirdeyesecurity.org> - 1.3
 - General tidy up
 - Automate configuration for standard templates on install
diff --git a/gpg.spec b/gpg.spec
index cdd8338..3945ef2 100644
--- a/gpg.spec
+++ b/gpg.spec
@@ -1,4 +1,4 @@
-Name:           split-gpg
+Name:           3isec-qubes-split-gpg
 Version:  	2.0
 Release:        1%{?dist}
 Summary:        Salt split-gpg template in Qubes
@@ -31,6 +31,8 @@ fi
 
 
 %changelog
+* Sat May 21 2022 unman <unman@thirdeyesecurity.org> - 1.4
+- Standardise package names to 3isec-
 * Sat May 14 2022 unman <unman@thirdeyesecurity.org> - 2.0
 - Change preun script
 * Sat May 14 2022 unman <unman@thirdeyesecurity.org> - 2.0
diff --git a/multimedia.spec b/multimedia.spec
index 5f18662..7527c25 100644
--- a/multimedia.spec
+++ b/multimedia.spec
@@ -1,4 +1,4 @@
-Name:           sys-multimedia
+Name:           3isec-qubes-sys-multimedia
 Version:  	2.1
 Release:        1%{?dist}
 Summary:        Salt multimedia template and qubes
@@ -20,12 +20,15 @@ cp -rv %{SOURCE0}/  %{buildroot}/srv/salt
 
 %post
 if [ $1 -eq 1 ]; then
-  qubesctl state.apply multimedia.create
+  qubesctl state.apply multimedia.clone
   qubesctl --skip-dom0 --targets=template-multimedia state.apply multimedia.install
+  qubesctl state.apply multimedia.create
   qubesctl --skip-dom0 --targets=media state.apply multimedia.configure
 fi
 
 %changelog
+* Sat May 21 2022 unman <unman@thirdeyesecurity.org> - 2.1
+- Standardise package names to 3isec-
 * Sun May 15 2022 unman <unman@thirdeyesecurity.org> - 2.0
 - Add post install salting
 * Wed Feb 03 2021 unman <unman@thirdeyesecurity.org>
diff --git a/print.spec b/print.spec
index 7864ec0..05194fd 100644
--- a/print.spec
+++ b/print.spec
@@ -1,5 +1,5 @@
-Name:           sys-printer
-Version:       	1.0
+Name:           3isec-qubes-sys-printer
+Version:       	1.1
 Release:        1%{?dist}
 Summary:        Salt a printer qube in Qubes
 
@@ -30,5 +30,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
+* Sat May 21 2022 unman <unman@thirdeyesecurity.org> - 1.1
+- Standardise package names to 3isec-
 * Sun May 15 2022 unman <unman@thirdeyesecurity.org> - 1.0
 - First Build