From 4afb1aab7014d0f2b8295ed05044273724fa0cd7 Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdziora@redhat.com>
Date: Nov 01 2018 15:19:26 +0000
Subject: Produce distro-level SWID tag in /usr/lib/swidtag/fedoraproject.org.


(cherry picked from commit 9f7bbda1a66fbbb30b128d16e875acdd3fa35a30)

Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com>

---

diff --git a/distro-template.swidtag b/distro-template.swidtag
new file mode 100644
index 0000000..94e1752
--- /dev/null
+++ b/distro-template.swidtag
@@ -0,0 +1,28 @@
+<!-- When changing this file, bump up the @tagVersion value. -->
+<?xml version="1.0" encoding="utf-8"?>
+<SoftwareIdentity
+  xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015/schema.xsd http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd"
+  xml:lang="en-US"
+  tagId="org.fedoraproject.Fedora-$version"
+  tagVersion="1"
+  name="Fedora"
+  version="$version"
+  versionScheme="unknown"
+  media="(OS:linux)">
+  <Entity
+    name="Fedora Project"
+    regid="fedoraproject.org"
+    role="tagCreator softwareCreator aggregator distributor licensor" />
+  <Link
+    rel="license"
+    href="https://fedoraproject.org/wiki/Legal:Licenses/LicenseAgreement" />
+  <Meta
+    product="Fedora"
+    colloquialVersion="$version"
+    summary="Linux distribution developed by the community-supported Fedora Project and sponsored by Red Hat, Inc."
+    entitlementDataRequired="false"
+    unspscCode="43233004"
+    unspscVersion="20.0601" />
+</SoftwareIdentity>
diff --git a/fedora-release.spec b/fedora-release.spec
index f04dc8c..aacd420 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -1,6 +1,7 @@
 %define release_name Twenty Nine
 %define dist_version 29
 %define bug_version 29
+%{!?_swidtagdir: %define _swidtagdir %{_prefix}/lib/swidtag/fedoraproject.org}
 
 # Change this when branching to fNN
 %define doc_version f29
@@ -14,7 +15,7 @@
 Summary:        Fedora release files
 Name:           fedora-release
 Version:        29
-Release:        2
+Release:        3
 License:        MIT
 URL:            https://fedoraproject.org/
 
@@ -31,6 +32,7 @@ Source15:       80-workstation.preset
 Source16:       org.gnome.shell.gschema.override
 Source17:       org.projectatomic.rpmostree1.rules
 Source18:       80-iot.preset
+Source19:       distro-template.swidtag
 
 Obsoletes:      redhat-release
 Obsoletes:      convert-to-edition < 29-0.15
@@ -374,6 +376,9 @@ install -Dm0644 %{SOURCE15} -t %{buildroot}%{_prefix}/lib/os.release.d/presets/
 install -Dm0644 %{SOURCE16} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
 install -Dm0644 %{SOURCE17} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
 
+# Create distro-level SWID tag file
+install -d %{buildroot}%{_swidtagdir}
+sed -e "s#\$version#%{bug_version}#g" -e 's/<!--.*-->//;/^$/d' %{SOURCE19} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-%{bug_version}.swidtag
 
 %post -p <lua>
 %include %{SOURCE4}
@@ -535,6 +540,8 @@ uninstall_edition("xfce")
 %{_prefix}/lib/systemd/system-preset/85-display-manager.preset
 %{_prefix}/lib/systemd/system-preset/90-default.preset
 %{_prefix}/lib/systemd/system-preset/99-default-disable.preset
+%dir %{_swidtagdir}
+%{_swidtagdir}/org.fedoraproject.Fedora-%{bug_version}.swidtag
 
 
 %files atomichost
@@ -585,6 +592,9 @@ uninstall_edition("xfce")
 %attr(0644,root,root) /usr/lib/os.release.d/os-release-xfce
 
 %changelog
+* Thu Nov 01 2018 Jan Pazdziora <jpazdziora@redhat.com> - 29-3
+- Produce distro-level SWID tag in /usr/lib/swidtag/fedoraproject.org.
+
 * Sat Oct 27 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-2
 - Add ostree-finalize-staged.path preset