diff --git a/61-oxygen-mono.conf b/61-oxygen-mono.conf new file mode 100644 index 0000000..217af7d --- /dev/null +++ b/61-oxygen-mono.conf @@ -0,0 +1,16 @@ + + + + + mono + + Oxygen Mono + + + + Oxygen Mono + + mono + + + diff --git a/61-oxygen-sans.conf b/61-oxygen-sans.conf new file mode 100644 index 0000000..b67fbc3 --- /dev/null +++ b/61-oxygen-sans.conf @@ -0,0 +1,16 @@ + + + + + sans + + Oxygen-Sans + + + + Oxygen-Sans + + sans + + + diff --git a/oxygen-fontconfig.conf b/oxygen-fontconfig.conf deleted file mode 100644 index b771911..0000000 --- a/oxygen-fontconfig.conf +++ /dev/null @@ -1,16 +0,0 @@ - - - - - sans - - Oxygen - - - - Oxygen - - sans - - - diff --git a/oxygen-fonts.spec b/oxygen-fonts.spec index 827d0e2..4959c86 100644 --- a/oxygen-fonts.spec +++ b/oxygen-fonts.spec @@ -1,18 +1,19 @@ %global fontname oxygen -%global fontconf 61-%{fontname}.conf +%global fontconf 61-%{fontname} %global plasma_version 5.0.2 -Name: oxygen-fonts +Name: %{fontname}-fonts Version: 0.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Oxygen fonts created by the KDE Community # See LICENSE-GPL+FE for details about the exception License: OFL or GPLv3 with exceptions URL: http://www.kde.org Source0: http://download.kde.org/stable/plasma/%{plasma_version}/%{name}-%{version}.tar.xz -Source1: %{fontname}-fontconfig.conf +Source1: %{fontconf}-sans.conf +Source2: %{fontconf}-mono.conf BuildArch: noarch BuildRequires: cmake @@ -25,10 +26,32 @@ Requires: fontpackages-filesystem %description Oxygen fonts created by the KDE Community. -%package devel +%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}. + +%package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -51,18 +74,31 @@ make %{?_smp_mflags} -C %{_target_platform} install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} + install -m 0644 -p %{SOURCE1} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf} -ln -s %{_fontconfig_templatedir}/%{fontconf} \ - %{buildroot}%{_fontconfig_confdir}/%{fontconf} + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf +install -m 0644 -p %{SOURCE2} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-mono.conf -%_font_pkg -f %{fontconf} *.ttf +ln -s %{_fontconfig_templatedir}/%{fontconf}-sans.conf \ + %{buildroot}/%{_fontconfig_confdir}/%{fontconf}-sans.conf +ln -s %{_fontconfig_templatedir}/%{fontconf}-mono.conf \ + %{buildroot}/%{_fontconfig_confdir}/%{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 common %doc COPYING-GPL+FE.txt COPYING-OFL GPL.txt README.md %files devel %{_libdir}/cmake/OxygenFont %changelog +* Thu Sep 25 2014 Daniel Vrátil - 0.4.2-3 +- Fix fontconfig.files (RHBZ#1146505) +- Create subpackages for sans and mono fonts + * Tue Sep 16 2014 Daniel Vrátil - 0.4.2-2 - oxygen-fonts 0.4.2