rpms/wqy-zenhei-fonts/devel wqy-zenhei-fonts.spec, 1.17, 1.18 wqy-zenhei-fonts-0.8.34-1-noprefer.patch, 1.3, NONE wqy-zenhei-fonts-0.8.38-1-zenheiset.patch, 1.1, NONE zenheiset-0.8.38-1-fontpackages.patch, 1.2, NONE

Peng Wu pwu at fedoraproject.org
Wed May 26 06:15:45 UTC 2010


Author: pwu

Update of /cvs/pkgs/rpms/wqy-zenhei-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14187

Modified Files:
	wqy-zenhei-fonts.spec 
Removed Files:
	wqy-zenhei-fonts-0.8.34-1-noprefer.patch 
	wqy-zenhei-fonts-0.8.38-1-zenheiset.patch 
	zenheiset-0.8.38-1-fontpackages.patch 
Log Message:
* Wed May 26 2010  Peng Wu <pwu at redhat.com> - 0.9.45-4
- Clean up rpm spec file and remove unused patches.




Index: wqy-zenhei-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/devel/wqy-zenhei-fonts.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- wqy-zenhei-fonts.spec	26 May 2010 03:00:47 -0000	1.17
+++ wqy-zenhei-fonts.spec	26 May 2010 06:15:43 -0000	1.18
@@ -24,7 +24,7 @@ named "WenQuanYi Zen Hei Mono".
 
 Name:           %{fontname}-fonts
 Version:        0.9.45
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        WenQuanYi Zen Hei CJK Font
 
 Group:          User Interface/X
@@ -39,9 +39,6 @@ BuildRoot:      %(mktemp -ud %{_tmppath}
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-#Patch0:         wqy-zenhei-fonts-0.8.34-1-noprefer.patch
-#Patch1:         zenheiset-0.8.38-1-fontpackages.patch
-#Patch2:         wqy-zenhei-fonts-0.8.38-1-zenheiset.patch
 
 %description
 %common_desc
@@ -57,10 +54,6 @@ This package consists of files used by o
 
 %prep
 %setup -q -n %{fontname}
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-
 
 %build
 %{nil}
@@ -79,9 +72,6 @@ install -m 0644 -p %{SOURCE1} \
 install -m 0644 -p %{SOURCE2} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
 
-#ln -s %{_fontconfig_templatedir}/%{fontconf} \
-#      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
-
 ln -s %{_fontconfig_templatedir}/%{fontconf1} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf1}
 
@@ -95,14 +85,15 @@ rm -fr %{buildroot}
 
 
 %_font_pkg -f ??-?-%{fontname}*.conf *.ttc
-#%dir %{_fontdir}
-#%files common
-#%defattr(-,root,root,-)
+%dir %{_fontdir}
 %doc AUTHORS ChangeLog COPYING README
 %attr(755, root, root) %{_bindir}/%{setscript}
 
 
 %changelog
+* Wed May 26 2010  Peng Wu <pwu at redhat.com> - 0.9.45-4
+- Clean up rpm spec file and remove unused patches.
+
 * Wed May 26 2010  Peng Wu <pwu at redhat.com> - 0.9.45-3
 - Improves Simplified Chinese and Traditional Chinese fonts.
   Resolves [rhbz#595223] Improves SC/TC fonts - Make wqy-zenhei as the default font for Simplified Chinese.


--- wqy-zenhei-fonts-0.8.34-1-noprefer.patch DELETED ---


--- wqy-zenhei-fonts-0.8.38-1-zenheiset.patch DELETED ---


--- zenheiset-0.8.38-1-fontpackages.patch DELETED ---



More information about the scm-commits mailing list