rpms/wqy-zenhei-fonts/F-13 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 wqy-zenhei-fonts-0.8.34-1-noprefer.patch, 1.2, 1.3 wqy-zenhei-fonts.spec, 1.14, 1.15 zenheiset-0.8.38-1-fontpackages.patch, 1.1, 1.2

Peng Wu pwu at fedoraproject.org
Mon Mar 15 05:42:40 UTC 2010 

Author: pwu

Update of /cvs/pkgs/rpms/wqy-zenhei-fonts/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23483

Modified Files:
	.cvsignore sources wqy-zenhei-fonts-0.8.34-1-noprefer.patch 
	wqy-zenhei-fonts.spec zenheiset-0.8.38-1-fontpackages.patch 
Log Message:
* Mon Mar 15 2010  Peng Wu <pwu at redhat.com> - 0.9.45-1
- Update to the upstream version 0.9.45 (#573330)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/F-13/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Mar 2009 05:37:03 -0000	1.7
+++ .cvsignore	15 Mar 2010 05:42:39 -0000	1.8
@@ -1 +1 @@
-wqy-zenhei-0.8.38-1.tar.gz
+wqy-zenhei-0.9.45.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Mar 2009 05:37:04 -0000	1.7
+++ sources	15 Mar 2010 05:42:39 -0000	1.8
@@ -1 +1 @@
-9f6c1b64170d08c568644f0661306729  wqy-zenhei-0.8.38-1.tar.gz
+4c6c3f4e902dd5ee0a121e8c41d040bd  wqy-zenhei-0.9.45.tar.gz

wqy-zenhei-fonts-0.8.34-1-noprefer.patch:
 44-wqy-zenhei.conf |   24 ------------------------
 1 file changed, 24 deletions(-)

Index: wqy-zenhei-fonts-0.8.34-1-noprefer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/F-13/wqy-zenhei-fonts-0.8.34-1-noprefer.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- wqy-zenhei-fonts-0.8.34-1-noprefer.patch	8 Mar 2009 05:37:04 -0000	1.2
+++ wqy-zenhei-fonts-0.8.34-1-noprefer.patch	15 Mar 2010 05:42:39 -0000	1.3
@@ -1,6 +1,8 @@
---- 44-wqy-zenhei.conf.orig	2009-01-17 08:08:17.000000000 -0500
-+++ 44-wqy-zenhei.conf	2009-01-17 01:50:31.000000000 -0500
-@@ -18,28 +18,4 @@
+diff --git a/44-wqy-zenhei.conf b/44-wqy-zenhei.conf
+index 5744827..4344c30 100644
+--- a/44-wqy-zenhei.conf
++++ b/44-wqy-zenhei.conf
+@@ -19,28 +19,4 @@
          <edit name="rgba" mode="assign"><const>none</const></edit>
          <edit name="embeddedbitmap"><bool>false</bool></edit>
    </match>
@@ -15,16 +17,16 @@
 -        <alias>
 -                <family>sans-serif</family>
 -                <prefer>
--                        <family>Bitstream Vera Sans</family>
 -                        <family>DejaVu Sans</family>
+-                        <family>Bitstream Vera Sans</family>
 -                        <family>WenQuanYi Zen Hei</family>
 -                </prefer>
 -        </alias>
 -        <alias>
 -                <family>monospace</family>
 -                <prefer>
--                        <family>Bitstream Vera Sans Mono</family>
 -                        <family>DejaVu Sans Mono</family>
+-                        <family>Bitstream Vera Sans Mono</family>
 -                        <family>WenQuanYi Zen Hei Mono</family>
 -                </prefer>
 -        </alias>


Index: wqy-zenhei-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/F-13/wqy-zenhei-fonts.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- wqy-zenhei-fonts.spec	1 Mar 2010 07:47:56 -0000	1.14
+++ wqy-zenhei-fonts.spec	15 Mar 2010 05:42:39 -0000	1.15
@@ -1,8 +1,7 @@
 %global fontname wqy-zenhei
 %global fontconf  44-%{fontname}.conf
 %global fontconf1 65-%{fontname}.conf
-%global fontconf2 66-%{fontname}-sharp.conf
-%global fontconf3 66-%{fontname}-sharp-no13px.conf
+%global fontconf2 43-%{fontname}-sharp.conf
 %define common_desc \
 WenQuanYi Zen Hei is a Hei-Ti style (sans-serif type) Chinese \
 outline font. It is designed for general purpose text formatting \
@@ -25,14 +24,14 @@ named "WenQuanYi Zen Hei Mono".
 %define setscript zenheiset
 
 Name:           %{fontname}-fonts
-Version:        0.8.38
-Release:        5%{?dist}
+Version:        0.9.45
+Release:        1%{?dist}
 Summary:        WenQuanYi Zen Hei CJK Font
 
 Group:          User Interface/X
 License:        GPLv2 with exceptions
 URL:            http://wenq.org/enindex.cgi
-Source0:        http://downloads.sourceforge.net/wqy/%{fontname}-%{version}-1.tar.gz
+Source0:        http://downloads.sourceforge.net/wqy/%{fontname}-%{version}.tar.gz
 Source1:        %{fontname}-fontconfig.conf
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -57,14 +56,13 @@ This package consists of files used by o
 
 %prep
 %setup -q -n %{fontname}
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
 
 
 %build
 
-
 %install
 rm -fr %{buildroot}
 
@@ -80,8 +78,6 @@ install -m 0644 -p %{SOURCE1} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}
 install -m 0644 -p %{fontconf2} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
-install -m 0644 -p %{fontconf3} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf3}
 
 ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
@@ -103,11 +99,15 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %files common
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %doc %attr(0755 ,root ,root) %{setscript} 
 
 
 %changelog
+* Mon Mar 15 2010  Peng Wu <pwu at redhat.com> - 0.9.45-1
+- Update to the upstream version 0.9.45 (#573330)
+
 * Mon Mar 01 2010 Peng Wu <pwu at redhat.com> - 0.8.38-5
 - make this package adopt the Packaging:FontsPolicy (#568587)
 

zenheiset-0.8.38-1-fontpackages.patch:
 zenheiset |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: zenheiset-0.8.38-1-fontpackages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-zenhei-fonts/F-13/zenheiset-0.8.38-1-fontpackages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zenheiset-0.8.38-1-fontpackages.patch	8 Mar 2009 05:37:04 -0000	1.1
+++ zenheiset-0.8.38-1-fontpackages.patch	15 Mar 2010 05:42:39 -0000	1.2
@@ -1,5 +1,7 @@
---- zenheiset.orig	2009-01-17 08:21:38.000000000 -0500
-+++ zenheiset	2009-01-17 08:22:19.000000000 -0500
+diff --git a/zenheiset b/zenheiset
+index a75c4c0..782f691 100755
+--- a/zenheiset
++++ b/zenheiset
 @@ -6,7 +6,7 @@
  # Qianqian Fang <fangq at nmr.mgh.harvard.edu>
  ###############################################
@@ -7,5 +9,5 @@
 -FAVAIL=/etc/fonts/conf.avail
 +FAVAIL=/usr/share/fontconfig/conf.avail
  FCONF=/etc/fonts/conf.d
- BMPCONF=66-wqy-zenhei-sharp.conf
+ BMPCONF=43-wqy-zenhei-sharp.conf
  BMPSTDCONF=66-wqy-zenhei-sharp-no13px.conf

More information about the scm-commits mailing list