From ea0928c5e4cb2440deda020d29b5b49a6a55415a Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Aug 04 2008 03:18:20 +0000 Subject: Fix file conflict with rpm --- diff --git a/import.log b/import.log new file mode 100644 index 0000000..5755fdd --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +man-pages-ko-20050219-4_fc9:F-9:man-pages-ko-20050219-4.fc9.src.rpm:1217819857 diff --git a/man-pages-ko.spec b/man-pages-ko.spec index ec98e19..1cfd929 100644 --- a/man-pages-ko.spec +++ b/man-pages-ko.spec @@ -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 @@ cp ../../SOURCES/Man_Page_Copyright COPYING 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 @@ cp -a man? $RPM_BUILD_ROOT%{_mandir}/ko/ %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 - 2:20050219-3 +* Mon Aug 04 2008 Ding-Yi Chen - 2:20050219-4 +- Fix the file conflict with rpm-4.5.90 + +* Tue Feb 05 2008 Ding-Yi Chen - 2:20050219-3 - Correct Licence information. - Add Korean summary and description -* Tue Jan 08 2008 Ding-Yi Chen - 2:20050219-2 +* Tue Jan 08 2008 Ding-Yi Chen - 2:20050219-2 - Bug 427684: man-pages fileconflict - Fix the conflict with vipw.8 (in shadow-utils) -* Thu Dec 06 2007 Ding-Yi Chen - 2:20050219-1 +* Thu Dec 06 2007 Ding-Yi Chen - 2:20050219-1 - Fix the conflict with man-1.6e-3.fc7 -* Thu Dec 06 2007 Ding-Yi Chen - 2:20050219-0 +* Thu Dec 06 2007 Ding-Yi Chen - 2:20050219-0 - man7/iso_8859-1.7 and man7/iso_8859-7.7 are back. - Upstream change version scheme.