[oxygen-fonts] provide oxygen-fonts (meta)package, fixes upgrade path (#1154369)

Rex Dieter rdieter at fedoraproject.org
Mon Oct 20 14:41:10 UTC 2014


commit 4df3e9ea5693ad3bb418a25c39a8252d3e4bc2b1
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Oct 20 09:41:11 2014 -0500

    provide oxygen-fonts (meta)package, fixes upgrade path (#1154369)

 oxygen-fonts.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/oxygen-fonts.spec b/oxygen-fonts.spec
index f65031c..a8892bc 100644
--- a/oxygen-fonts.spec
+++ b/oxygen-fonts.spec
@@ -3,7 +3,7 @@
 
 Name:           %{fontname}-fonts
 Version:        5.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Oxygen fonts created by the KDE Community
 
 # See LICENSE-GPL+FE for details about the exception
@@ -24,29 +24,28 @@ BuildRequires:  fontforge
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
 
+# main (meta)package, largely for upgrade path
+Requires: %{fontname}-mono-fonts = %{version}-%{release}
+Requires: %{fontname}-sans-fonts = %{version}-%{release}
+
 %description
 Oxygen fonts created by the KDE Community.
 
 %package common
 Summary:        Common files for Oxygen font
 Requires:       fontpackages-filesystem
-Obsoletes:      %{fontname}-fonts <= 0.4.2-1
 %description    common
 %{summary}.
 
 %package -n %{fontname}-mono-fonts
 Summary:        Oxygen Monospaced Font
 Requires:       %{name}-common = %{version}-%{release}
-Obsoletes:      %{fontname}-fonts <= 0.4.2-1
-Provides:       oxygen-fonts = %{version}-%{release}
 %description    -n %{fontname}-mono-fonts
 %{summary}.
 
 %package -n %{fontname}-sans-fonts
 Summary:        Oxygen Sans-Serif Font
 Requires:       %{name}-common = %{version}-%{release}
-Obsoletes:      %{fontname}-fonts <= 0.4.2-1
-Provides:       oxygen-fonts = %{version}-%{release}
 %description    -n %{fontname}-sans-fonts
 %{summary}.
 
@@ -90,13 +89,19 @@ ln -s %{_fontconfig_templatedir}/%{fontconf}-mono.conf \
 %_font_pkg -n sans -f %{fontconf}-sans.conf Oxygen-Sans*.ttf
 %_font_pkg -n mono -f %{fontconf}-mono.conf OxygenMono*.ttf
 
+%files
+# empty metapackage
+
 %files common
 %doc COPYING-GPL+FE.txt COPYING-OFL GPL.txt README.md
 
 %files devel
-%{_libdir}/cmake/OxygenFont
+%{_libdir}/cmake/OxygenFont/
 
 %changelog
+* Mon Oct 20 2014 Rex Dieter <rdieter at fedoraproject.org> 5.1.0-2
+- provide oxygen-fonts (meta)package, fixes upgrade path (#1154369)
+
 * Thu Oct 09 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.0-1
 - oxygen-font 5.1.0
 


More information about the scm-commits mailing list