rpms/man-pages-es/devel man-pages-es.spec,1.15,1.16

[Ding-Yi Chen (dchen)]

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-es/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25531/devel

Modified Files:
	man-pages-es.spec 
Log Message:
- [Bug 388391] New: fileconflicts with other packages
- Remove mc.1.gz, as it conflicts with mc-4.6.1a-49.20070604cvs.fc8.i386.rpm
- Remove newgrp.1.gz, as it conflicts with shadow-utils-4.0.18.1-18.fc8.i386.rpm




Index: man-pages-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-es/devel/man-pages-es.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- man-pages-es.spec	31 Oct 2007 05:48:51 -0000	1.15
+++ man-pages-es.spec	19 Nov 2007 01:31:55 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Spanish man pages from the Linux Documentation Project.
 Name: man-pages-es
 Version: 1.55
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: Distributable
 Group: Documentation
 URL: http://ditec.um.es/~piernas/manpages-es/
@@ -51,6 +51,10 @@
 cp %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/LEEME.extra %{_builddir}/%{name}-%{version}/
 cp %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/PAQUETES %{_builddir}/%{name}-%{version}/
 cp %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/PROYECTO %{_builddir}/%{name}-%{version}/
+# Bug 388391
+rm %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/man1/mc.1
+rm %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/man1/newgrp.1
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1470,7 +1474,6 @@
 %{_mandir}/es/man1/make.1.gz
 %{_mandir}/es/man1/mattrib.1.gz
 %{_mandir}/es/man1/mbadblocks.1.gz
-%{_mandir}/es/man1/mc.1.gz
 %{_mandir}/es/man1/mcd.1.gz
 %{_mandir}/es/man1/mcopy.1.gz
 %{_mandir}/es/man1/mdel.1.gz
@@ -1491,7 +1494,6 @@
 %{_mandir}/es/man1/mtype.1.gz
 %{_mandir}/es/man1/mzip.1.gz
 %{_mandir}/es/man1/namei.1.gz
-%{_mandir}/es/man1/newgrp.1.gz
 %{_mandir}/es/man1/nice.1.gz
 %{_mandir}/es/man1/nisdomainname.1.gz
 %{_mandir}/es/man1/nlmconv.1.gz
@@ -1687,7 +1689,13 @@
 
 
 %changelog
+* Mon Nov 19 2007 Ding-Yi Chen <dchen at redhat.com> - 1.55-1
+- [Bug 388391] New: fileconflicts with other packages
+- Remove mc.1.gz, as it conflicts with mc-4.6.1a-49.20070604cvs.fc8.i386.rpm
+- Remove newgrp.1.gz, as it conflicts with shadow-utils-4.0.18.1-18.fc8.i386.rpm
+
 * Wed Oct 31 2007 Ding-Yi Chen <dchen at redhat.com> - 1.55
+- Update to 1.55
 - Add Spanish summaries and descriptions
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.28-10.1.1