diff --git a/.cvsignore b/.cvsignore index 9475cc5..216db4d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -man-pages-fr-3.03.0.tar.bz2 +man-pages-fr-3.23-1.tar.bz2 man-pages-extras-fr-0.8.1.tar.bz2 mansupfr.tar.bz2 diff --git a/man-pages-fr.spec b/man-pages-fr.spec index b7985de..4e93dd3 100644 --- a/man-pages-fr.spec +++ b/man-pages-fr.spec @@ -1,18 +1,19 @@ %define REV_EXTRAS 0.8.1 %define REV_SUP 20080608 +%define SUBREV 1 Summary: French version of the Linux man-pages Name: man-pages-fr -Version: 3.03.0 -Release: 5%{?dist} +Version: 3.23 +Release: 1%{?dist} License: GPL+ Group: Documentation URL: http://manpagesfr.free.fr/ -Source0: http://manpagesfr.free.fr/download/%{name}-%{version}.tar.bz2 +Source0: https://alioth.debian.org/frs/download.php/3223/%{name}-%{version}-%{SUBREV}.tar.bz2 Source1: http://www.delafond.org/traducmanfr/mansupfr.tar.bz2 Source2: http://manpagesfr.free.fr/download/man-pages-extras-fr-%{REV_EXTRAS}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +BuildArch: noarch %description Manual pages from the man-pages Project, translated into French. @@ -20,8 +21,9 @@ Also includes supplemental pages provided by Dr. Patrick Atlas and Dr. Gerard Delafond. %prep -%setup -q -D -a 1 -%setup -q -D -a 2 +%setup -q -c -n man-pages-fr-3.23 +%setup -q -D -T -a 1 +%setup -q -D -T -a 2 # pick up the supplemental pages @@ -70,20 +72,23 @@ make install-fedora DESTDIR=$RPM_BUILD_ROOT # This page is provided by sitecopy package %{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1 -LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/ +# This page is provided by nmap package +%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/nmap.1 + +#LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/ %clean rm -fr $RPM_BUILD_ROOT %files %defattr(0644,root,root,0755) -%doc changements changements.anciens LISEZ_MOI LISEZ_MOI.man-pages-sup-fr -%doc Changements Changements.anciens Lisez_moi A_FAIRE +%doc fr/README.fr LISEZ_MOI.man-pages-sup-fr Changements Changements.anciens Lisez_moi %{_mandir}/fr/ %changelog -* Mon Oct 12 2009 Marcela Maslanova 3.03.0-5 -- upload correct source. Source1 didn't match with upstream tarball. +* Sun Feb 07 2010 Pablo Martin-Gomez 3.23-1 +- Fix RH #560915 +- Switch to the Debian's man-pages-fr fork (Source0), which is updated, correctly maintained and provide the patches from man-pages Fedora package * Sat Jul 25 2009 Fedora Release Engineering - 3.03.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 1ae98a1..d06d8b3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -64046b022c7c8d559d78dd05f953261b man-pages-fr-3.03.0.tar.bz2 +9218c01312df3cbf9e1ff27e3b8bc6ee man-pages-fr-3.23-1.tar.bz2 94b3c7d6a13f6492417d25d3dc92b016 man-pages-extras-fr-0.8.1.tar.bz2 -c916955f838860334bb9c629e4af19b0 mansupfr.tar.bz2 +55e047ee3f34c2d96b7e69a2bbdd67f0 mansupfr.tar.bz2