[man-pages-zh-CN] Update to 1.5.2

Peng Wu pwu at fedoraproject.org
Mon Aug 27 06:32:59 UTC 2012


commit f29605c91ebc290cc60936898b9367a66f699f62
Author: Peng Wu <alexepico at gmail.com>
Date:   Thu Aug 23 16:29:52 2012 +0800

    Update to 1.5.2

 .gitignore           |    1 +
 man-pages-zh-CN.spec |   21 ++++++++++-----------
 sources              |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7d72e4..4f57697 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /manpages-zh-1.5.1.tar.gz
+/manpages-zh-1.5.2.tar.bz2
diff --git a/man-pages-zh-CN.spec b/man-pages-zh-CN.spec
index ec2961c..671796e 100644
--- a/man-pages-zh-CN.spec
+++ b/man-pages-zh-CN.spec
@@ -1,22 +1,20 @@
-%define origName manpages-zh
+%define origname manpages-zh
+
 Summary: Chinese Man Pages from Chinese Man Pages Project
 Name: man-pages-zh-CN
-Version: 1.5.1
-Release: 6%{?dist}
+Version: 1.5.2
+Release: 1%{?dist}
 License: GFDL
 Group: Documentation
 #Vendor: From CMPP (Chinese Man Pages Project)
 URL: http://code.google.com/p/manpages-zh/
-Source0: http://manpages-zh.googlecode.com/files/%{origName}-%{version}.tar.gz
+Source0: https://github.com/downloads/lidaobing/manpages-zh/%{origname}-%{version}.tar.bz2
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArchitectures: noarch
 Summary(zh_CN): 中文 man pages
 
-%if 0%{?fedora} >= 13
 Requires: man-pages-reader
-%else
-Requires: man
-%endif
+
 
 %description
 manpages-zh is a sub-project from i18n-zh, from the Chinese Man Pages
@@ -34,7 +32,7 @@ CMPP 项目现在可能已经死亡,原主页(cmpp.linuxforum.net)已不能访
 本项目的目的是维护 CMPP 遗留下的成果,并对其错误/漏洞进行修改。
 
 %prep
-%setup -q -n %{origName}-%{version}
+%setup -q -n %{origname}-%{version}
 
 %build 
 # Disable zh_TW, as it requires dependencies only available in Debian.
@@ -48,8 +46,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/zh_CN
 %__make install DESTDIR=$RPM_BUILD_ROOT 
 # Remove file conflict
 %define manDest $RPM_BUILD_ROOT%{_mandir}/zh_CN
-%__rm %{manDest}/man1/mencoder.1
-%__rm %{manDest}/man1/mplayer.1
 %__rm %{manDest}/man1/newgrp.1
 
 %__rm %{manDest}/man8/chpasswd.8
@@ -70,6 +66,9 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/zh_CN
 %{_mandir}/zh_CN/man*/*
 
 %changelog
+* Thu Aug 23 2012  Peng Wu <pwu at redhat.com> - 1.5.2-1
+- Update to 1.5.2
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index f7b34e7..bab2313 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13275fd039de8788b15151c896150bc4  manpages-zh-1.5.1.tar.gz
+cab232c7bb49b214c2f7ee44f7f35900  manpages-zh-1.5.2.tar.bz2


More information about the scm-commits mailing list