rpms/man-pages-ko/F-7 import.log, NONE, 1.1 man-pages-ko.spec, 1.17, 1.18

[Ding-Yi Chen (dchen)]

Author: dchen

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

Modified Files:
	man-pages-ko.spec 
Added Files:
	import.log 
Log Message:
Fix file conflict with rpm


--- NEW FILE import.log ---
man-pages-ko-20050219-4_fc9:F-7:man-pages-ko-20050219-4.fc9.src.rpm:1217819693


Index: man-pages-ko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ko/F-7/man-pages-ko.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- man-pages-ko.spec	28 Feb 2008 04:12:43 -0000	1.17
+++ man-pages-ko.spec	4 Aug 2008 03:14:48 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Korean(Hangul) Man(manual) Pages from the Korean Manpage Project
 Name: man-pages-ko
 Version: 20050219
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Copyright only
 Epoch: 2
 Group: Documentation
@@ -37,6 +37,9 @@
 rm -f ./man1/man.1 ./man1/whatis.1 ./man5/man.config.5 
 #conflict with shadow-utils in Fedora 9
 rm -f ./man8/vipw.8
+#conflict with rpms in Fedora 9
+rm -f ./man8/rpm.8 ./man8/rpmcpio.8
+
 
 for i in `find . -type f -name \*.gz`; do
     gunzip $i
@@ -75,27 +78,30 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
 
 %files
+%defattr(-, root,root, -)
 %doc COPYING
-%defattr(-,root,root, -)
 %{_mandir}/ko
 
 %changelog
-* Tue Feb 05 2008 Ding-Yi Chen <dchen at redhat.com> - 2:20050219-3
+* Mon Aug 04 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-4
+- Fix the file conflict with rpm-4.5.90
+
+* Tue Feb 05 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-3
 - Correct Licence information.
 - Add Korean summary and description
 
-* Tue Jan 08 2008 Ding-Yi Chen <dchen at redhat.com> - 2:20050219-2
+* Tue Jan 08 2008 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-2
 - Bug 427684: man-pages fileconflict
 - Fix the conflict with vipw.8 (in shadow-utils)
 
 
-* Thu Dec 06 2007 Ding-Yi Chen <dchen at redhat.com> - 2:20050219-1
+* Thu Dec 06 2007 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-1
 - Fix the conflict with man-1.6e-3.fc7
 
-* Thu Dec 06 2007 Ding-Yi Chen <dchen at redhat.com> - 2:20050219-0
+* Thu Dec 06 2007 Ding-Yi Chen <dchen at redhat dot com> - 2:20050219-0
 - man7/iso_8859-1.7 and man7/iso_8859-7.7 are back.
 - Upstream change version scheme.