rpms/man-pages-fr/F-7 man-pages-fr.spec,1.30,1.31
Marcela Mašláňová (mmaslano)
fedora-extras-commits at redhat.com
Wed Sep 12 13:10:57 UTC 2007
- Previous message (by thread): rpms/gettext/devel gettext-xglade-include-expat-285701.patch, NONE, 1.1 gettext.spec, 1.76, 1.77
- Next message (by thread): rpms/system-config-printer/devel pycups-1.9.26.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.140, 1.141 sources, 1.145, 1.146 system-config-printer.spec, 1.128, 1.129 pycups-1.9.25.tar.bz2.sig, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mmaslano
Update of /cvs/pkgs/rpms/man-pages-fr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5355
Modified Files:
man-pages-fr.spec
Log Message:
Fix conflict in 273941
Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-fr/F-7/man-pages-fr.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- man-pages-fr.spec 6 Mar 2007 07:42:37 -0000 1.30
+++ man-pages-fr.spec 12 Sep 2007 13:10:23 -0000 1.31
@@ -1,8 +1,8 @@
Summary: French man pages from the Linux Documentation Project
Name: man-pages-fr
Version: 2.39
-Release: 8%{?dist}
-License: Distributable
+Release: 9%{?dist}
+License: GPL+
Group: Documentation
URL: http://manpagesfr.free.fr/
Source0: http://manpagesfr.free.fr/download/%{name}-%{version}.tar.bz2
@@ -17,9 +17,6 @@
%prep
%setup -q -D -a 1 -n man-pages-fr-2.39.0
-##%setup -q -D -a 2
-##%patch1 -p1 -b .aumix_missTH
-# pick up the supplemental pages, which overwrite a few files too
cp -a pagesdeman/usr/share/man/fr/* .
mv -f pagesdeman/LISEZ_MOI LISEZ_MOI-mansupfr
rm -rf pagesdeman/
@@ -53,8 +50,6 @@
fi
done
-##make install-install DESTDIR=$RPM_BUILD_ROOT
-
# Remove files already included in other packages
# alsa-utils
rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/alsaconf.8
@@ -73,6 +68,8 @@
rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{gpasm,gpdasm,gplib,gplink,gpstrip,gputils,gpvc,gpvo}.1
# latex2rtf
rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/latex2rtf.1
+# linuxchecker
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/linkchecker.1
# man
rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{apropos,man,man2html,whatis}.1
rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/man.config.5
@@ -104,6 +101,9 @@
%{_mandir}/fr/
%changelog
+* Wed Sep 12 2007 Marcela Maslanova <mmaslano at redhat.com> 2.39-9
+- rhbz#273941
+
* Mon Mar 05 2007 Marcela Maslanova <mmaslano at redhat.com> 2.39-8
- merge review
- rhbz#230061
- Previous message (by thread): rpms/gettext/devel gettext-xglade-include-expat-285701.patch, NONE, 1.1 gettext.spec, 1.76, 1.77
- Next message (by thread): rpms/system-config-printer/devel pycups-1.9.26.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.140, 1.141 sources, 1.145, 1.146 system-config-printer.spec, 1.128, 1.129 pycups-1.9.25.tar.bz2.sig, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list