rpms/man-pages-ko/F-7 import.log, 1.2, 1.3 man-pages-ko.spec, 1.19, 1.20

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-ko/F-7
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3517/F-7

Modified Files:
	import.log man-pages-ko.spec 
Log Message:
#468501, #468499


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-7/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	15 Sep 2008 07:17:45 -0000	1.2
+++ import.log	27 Oct 2008 00:40:52 -0000	1.3
@@ -1,2 +1,3 @@
 man-pages-ko-20050219-4_fc9:F-7:man-pages-ko-20050219-4.fc9.src.rpm:1217819693
 man-pages-ko-20050219-5_fc9:F-7:man-pages-ko-20050219-5.fc9.src.rpm:1221463057
+man-pages-ko-20050219-7_fc9:F-7:man-pages-ko-20050219-7.fc9.src.rpm:1225068001


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-7/man-pages-ko.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- man-pages-ko.spec	15 Sep 2008 07:17:45 -0000	1.19
+++ man-pages-ko.spec	27 Oct 2008 00:40:52 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
@@ -39,7 +39,8 @@
 rm -f ./man8/vipw.8
 #conflict with rpms in Fedora 9
 rm -f ./man8/rpm.8 ./man8/rpm2cpio.8
-
+# Bug 468501
+rm -f ./man1/cpio.1
 
 %build 
 for i in `find . -type f -name \*.gz`; do
@@ -85,6 +86,10 @@
 %{_mandir}/ko
 
 %changelog
+* Mon Oct 27 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-7
+- Fix Bug 468501 - There were file conflicts when cheeking the packages 
+  to be installed in Fedora-10-beta-x86_6.
+
 * Mon Sep 15 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-5
 - Fix Bug 462197 -  File conflict between man-pages-ko and rpm