rpms/man-pages-es/F-10 import.log, NONE, 1.1 man-pages-es.spec, 1.20, 1.21

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-es/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22946/F-10

Modified Files:
	man-pages-es.spec 
Added Files:
	import.log 
Log Message:
Fixed Bug #487941


--- NEW FILE import.log ---
man-pages-es-1_55-7_fc10:F-10:man-pages-es-1.55-7.fc10.src.rpm:1235951957


Index: man-pages-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-es/F-10/man-pages-es.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- man-pages-es.spec	8 Jan 2008 00:03:13 -0000	1.20
+++ man-pages-es.spec	1 Mar 2009 23:59:53 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Spanish man pages from the Linux Documentation Project
 Name: man-pages-es
 Version: 1.55
-Release: 5%{?dist}
+Release: 7%{?dist}
 # These man pages come under various copyrights.
 # All are freely distributable when the nroff source is included.
 License: IEEE
@@ -98,6 +98,9 @@
 #[Bug 427684] man-pages fileconflict
 #- Fix the conflict with vipw.8 (in shadow-utils)
 rm $RPM_BUILD_ROOT%{_mandir}/es/man8/vipw.8
+#[Bug 487941]File conflict between man-pages-es-extra and shadow-utils
+rm $RPM_BUILD_ROOT%{_mandir}/es/man8/vigr.8
+
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -1703,12 +1706,19 @@
 %{_mandir}/es/man8/umount.8.gz
 %{_mandir}/es/man8/update.8.gz
 %{_mandir}/es/man8/vidmode.8.gz
-%{_mandir}/es/man8/vigr.8.gz
+#%{_mandir}/es/man8/vigr.8.gz
 %{_mandir}/es/man8/vmstat.8.gz
 
 
 
 %changelog
+* Mon Mar 03 2009 Ding-Yi Chen <dchen at redhat.com> - 1.55-7
+- #[Bug 487941]File conflict between man-pages-es-extra and shadow-utils
+  Removed es/man8/vigr.8.gz
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.55-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Jan 08 2008 Ding-Yi Chen <dchen at redhat.com> - 1.55-5
 - Bug 427684: man-pages fileconflict
 - Fix the conflict with vipw.8 (in shadow-utils)