[cjkuni-uming-fonts] Improves spec file

Peng Wu pwu at fedoraproject.org
Tue Nov 13 06:04:40 UTC 2012


commit 2a5a4ce0d79c690ec56c1cbff81a22635ede83dd
Author: Peng Wu <alexepico at gmail.com>
Date:   Tue Nov 13 11:55:10 2012 +0800

    Improves spec file

 cjkuni-uming-fonts.spec |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/cjkuni-uming-fonts.spec b/cjkuni-uming-fonts.spec
index 7971d2d..c0adac8 100644
--- a/cjkuni-uming-fonts.spec
+++ b/cjkuni-uming-fonts.spec
@@ -1,20 +1,19 @@
 %global fontname cjkuni-uming
 %global fontconf 65-0-ttf-arphic-uming.conf
-#%global fontconf2 25-ttf-arphic-uming-render.conf
 %global fontconf3 90-ttf-arphic-uming-embolden.conf
 
-%define catalogue        %{_sysconfdir}/X11/fontpath.d
+%global catalogue        %{_sysconfdir}/X11/fontpath.d
 
-%define common_desc \
+%global common_desc \
 CJK Unifonts are Unicode TrueType fonts derived from original fonts made \
 available by Arphic Technology under "Arphic Public License" and extended by \
 the CJK Unifonts project.
 
-%define umingbuilddir %{name}-%{version}
+%global umingbuilddir %{name}-%{version}
 
 Name:           %{fontname}-fonts
 Version:        0.2.20080216.1
-Release:        50%{?dist}
+Release:        51%{?dist}
 Summary:        Chinese Unicode TrueType font in Ming face
 
 Group:          User Interface/X
@@ -22,13 +21,13 @@ License:        Arphic
 URL:            http://www.freedesktop.org/wiki/Software/CJKUnifonts
 Source0:        http://ftp.debian.org/debian/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_%{version}.orig.tar.gz
 Source1:        %{name}-fontconfig.conf
-#Source2:        %{fontconf2}
 Source3:        %{fontconf3}
 
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
 Obsoletes:      cjkuni-fonts-common < 0.2.20080216.1-42
+Provides:       cjkuni-fonts-common = 0.2.20080216.1-42
 
 %description
 %common_desc
@@ -55,11 +54,6 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 
-#install -m 0644 -p %{SOURCE2} \
-#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
-#ln -s %{_fontconfig_templatedir}/%{fontconf2} \
-#      %{buildroot}%{_fontconfig_confdir}/%{fontconf2}
-
 install -m 0644 -p %{SOURCE3} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf3}
 ln -s %{_fontconfig_templatedir}/%{fontconf3} \
@@ -82,6 +76,9 @@ ln -s %{_fontdir}/ %{buildroot}%{catalogue}/%{name}
 %{catalogue}/%{name}
 
 %changelog
+* Tue Nov 13 2012  Peng Wu <pwu at redhat.com> - 0.2.20080216.1-51
+- Improves spec file
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.20080216.1-50
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list