From 9d80355a124d277cef5ff69783ff498d23e2e4c3 Mon Sep 17 00:00:00 2001
From: Nicolas Mailhot <nim@arekh.okg>
Date: Feb 18 2009 22:46:13 +0000
Subject: %global is the new black


---

diff --git a/changelog.txt b/changelog.txt
index bf0a301..13681af 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+1.20 - Change %define to %global in templates
 1.19 - Add partial templates for fonts subpackages of other packages, update
        for rpm 4.6 changes in fedora-devel
 1.18 - Auto-own the fonts directory, multiple ownership is ok after all
diff --git a/spec-templates/spectemplate-fonts-multi.spec b/spec-templates/spectemplate-fonts-multi.spec
index 8bd94a1..c031060 100644
--- a/spec-templates/spectemplate-fonts-multi.spec
+++ b/spec-templates/spectemplate-fonts-multi.spec
@@ -1,9 +1,9 @@
-%define fontname <FONTNAME>
-%define fontconf <①>-%{fontname}
+%global fontname <FONTNAME>
+%global fontconf <①>-%{fontname}
 
-#define archivename %{name}-%{version} ②
+#global archivename %{name}-%{version} ②
 
-%define common_desc \
+%global common_desc \
 <FONT COLLECTION DESCRIPTION: ③>
 
 
diff --git a/spec-templates/spectemplate-fonts-partial-multi.spec b/spec-templates/spectemplate-fonts-partial-multi.spec
index e8730ce..0ba8b5b 100644
--- a/spec-templates/spectemplate-fonts-partial-multi.spec
+++ b/spec-templates/spectemplate-fonts-partial-multi.spec
@@ -1,8 +1,8 @@
-%define fontconf <①>-%{name}
+%global fontconf <①>-%{name}
 
 # …
 
-%define common_font_desc \
+%global common_font_desc \
 <FONT COLLECTION DESCRIPTION: ②>
 
 Source1:        %{name}-<FAMILY>-fontconfig.conf
diff --git a/spec-templates/spectemplate-fonts-partial-simple.spec b/spec-templates/spectemplate-fonts-partial-simple.spec
index 8f00bd7..1422f29 100644
--- a/spec-templates/spectemplate-fonts-partial-simple.spec
+++ b/spec-templates/spectemplate-fonts-partial-simple.spec
@@ -1,4 +1,4 @@
-%define fontconf <①>-%{name}-<FAMILY>.conf
+%global fontconf <①>-%{name}-<FAMILY>.conf
 
 # …
 
diff --git a/spec-templates/spectemplate-fonts-simple.spec b/spec-templates/spectemplate-fonts-simple.spec
index 18d849b..824f816 100644
--- a/spec-templates/spectemplate-fonts-simple.spec
+++ b/spec-templates/spectemplate-fonts-simple.spec
@@ -1,7 +1,7 @@
-%define fontname <FONTNAME>
-%define fontconf <①>-%{fontname}.conf
+%global fontname <FONTNAME>
+%global fontconf <①>-%{fontname}.conf
 
-#define archivename %{name}-%{version} ②
+#global archivename %{name}-%{version} ②
 
 Name:           %{fontname}-fonts
 Version:        <③>