rpms/man-pages-fr/F-7 .cvsignore, 1.7, 1.8 man-pages-fr.spec, 1.31, 1.32 sources, 1.10, 1.11

[Alain Portal (dionysos)]

Author: dionysos

Update of /cvs/extras/rpms/man-pages-fr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1437

Modified Files:
	.cvsignore man-pages-fr.spec sources 
Log Message:
- Synchronize spec file with upstream one: many cleanup
- Increase release number to supersede upstream repository




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Aug 2006 12:28:45 -0000	1.7
+++ .cvsignore	29 Apr 2008 13:11:24 -0000	1.8
@@ -1,2 +1,3 @@
+man-pages-fr-2.79.0.tar.bz2
+man-pages-extras-fr-0.7.11.tar.bz2
 mansupfr.tar.bz2
-man-pages-fr-2.39.tar.bz2


Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/F-7/man-pages-fr.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- man-pages-fr.spec	12 Sep 2007 13:10:23 -0000	1.31
+++ man-pages-fr.spec	29 Apr 2008 13:11:24 -0000	1.32
@@ -1,94 +1,59 @@
-Summary:	French man pages from the Linux Documentation Project
+%define	REV_EXTRAS 0.7.11
+
+Summary:	French version of the Linux man-pages
 Name:		man-pages-fr
-Version:	2.39
-Release:	9%{?dist}
+Version:	2.79.0
+Release:	3%{?dist}
 License:	GPL+
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
 Source0:	http://manpagesfr.free.fr/download/%{name}-%{version}.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
 
 %description
-Manual pages from the Linux Documentation Project, translated into French. Also
-includes supplemental pages provided by Dr. Patrick Atlas and Dr. Gerard
-Delafond.
+Manual pages from the man-pages Project, translated into French.
+Also includes supplemental pages provided by Dr. Patrick Atlas and
+Dr. Gerard Delafond.
 
 %prep
-%setup -q -D -a 1 -n man-pages-fr-2.39.0
+%setup -q -D -a 1
+%setup -q -D -a 2
+
+# remove duplicated pages
+%{__rm} -rf pagesdeman/usr/share/man/fr/man1/groups.1
+%{__rm} -rf pagesdeman/usr/share/man/fr/man8/rpc.statd.8
+
+# pick up the supplemental pages
 cp -a pagesdeman/usr/share/man/fr/* .
 mv -f pagesdeman/LISEZ_MOI LISEZ_MOI-mansupfr
-rm -rf pagesdeman/
+%{__rm} -rf pagesdeman/
+cp -a man-pages-extras-fr-%{REV_EXTRAS}/* .
+%{__rm} -rf man-pages-extras-fr-%{REV_EXTRAS}/
 
 %build
 
 %install
-rm -fr $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 # Create all the directories to be sure this package owns them
 for n in 1 2 3 4 5 6 7 8 9 ; do
   mkdir -p $RPM_BUILD_ROOT%{_mandir}/fr/man${n}
 done
 
-# gawk haven't coding, but it's in latin1
 for i in man?/*; do
-	CODING=`file -i ${i} | cut -d"=" -f2`;
-		if [[ "${CODING}" == "utf-8" ||  "${CODING}" == "us-ascii" || "${CODING}" == "iso-8859-1" ]]
-		then
-			if [ "${CODING}" != "UTF-8" ]
-			then
-				iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new
-				install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-				rm -rf ${i}.new
-			else
-				install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-			fi
-		else 
-			iconv -f LATIN1 -t UTF-8 < ${i} > ${i}.new
-			install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-			rm -rf ${i}.new
-		fi
+  %{__install} -m 0644 "${i}" "$RPM_BUILD_ROOT%{_mandir}/fr/${i}"
 done
 
+make install-fedora DESTDIR=$RPM_BUILD_ROOT
+
 # Remove files already included in other packages
-# alsa-utils
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/alsaconf.8
-# cups
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend,cancel,filter,lp,lpoptions,lppasswd,lpq,lpr,lprm,lpstat,rnano}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/cups-config.3
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf,cupsd.conf,mime.convs,mime.types,printers.conf}.5
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept,cups-lpd,cups-polld,cupsaddsmb,cupsd,enable,lpadmin,lpc,lpinfo,lpmove,reject}.8
-#enemies-of-carlotta
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/enemies-of-carlotta.1
-# fcron
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{fcrondyn,fcrontab}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{fcron.conf,fcrontab}.5
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/fcron.8
-# gputils
-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
-#nano
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/nano.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/nanorc.5
-# net-tools
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{dnsdomainname,domainname,hostname}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/ethers.5
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{arp,ifconfig,plipconfig,route,slattach}.8
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/latex2rtf.1
 # shadow-utils
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{chage,gpasswd,newgrp,sg}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/{getspnam,shadow}.3
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{faillog,shadow}.5
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{adduser,chpasswd,faillog,groupadd,groupdel,groupmod,grpck,lastlog,newusers,pwck,pwconv,useradd,userdel,usermod}.8
-# vim
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{rview,view,vim,vimdiff,vimtutor}.1
-#xawtv                                                                                                                        
-rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/xawtv.1
+# This page is provided by LDP so we have to remove it from shadow-utils package
+%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man3/getspnam.3
 
 LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/
 
@@ -97,12 +62,47 @@
 
 %files
 %defattr(0644,root,root,0755)
+%doc changements changements.anciens LISEZ_MOI
 %doc changements changements.anciens LISEZ_MOI LISEZ_MOI-mansupfr
+%doc Changements Changements.anciens Lisez_moi A_FAIRE
 %{_mandir}/fr/
 
 %changelog
-* Wed Sep 12 2007 Marcela Maslanova <mmaslano at redhat.com> 2.39-9
-- rhbz#273941
+* Tue Apr 29 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.79.0-3
+- Synchronize spec file with upstream one: many cleanup
+- Increase release number to supersede upstream repository
+
+* Fri Apr 25 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.79.0-2
+- New ${SOURCE2} tarball
+
+* Thu Apr 24 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.79.0-1
+- Update to 2.79.0
+
+* Wed Apr 23 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.78.0-1
+- Update to 2.78.0
+
+* Wed Apr 23 2008 Alain Portal <aportal AT univ-montp2 DOT fr> 2.77.0-1
+- Update to 2.77.0
+
+* Tue Feb 19 2008 Marcela Maslanova <mmaslano at redhat.com> 2.76.0-1
+- update on 2.76.0
+- definitely remove second source, wasn't used
+
+* Fri Jan 11 2008 Marcela Maslanova <mmaslano at redhat.com> 2.75.0-1
+- update on 2.75.0
+
+* Tue Dec 18 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-11
+- fix #425051 exclude vipw
+
+* Tue Sep 18 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-10
+- rebuild with correct sources
+
+* Mon Sep 10 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-9
+- 273941 doesn't install linkchecker man page
+
+* Wed Aug 22 2007 Marcela Maslanova <mmaslano at redhat.com> 2.40.0-1
+- new version from upstream
+- check license
 
 * Mon Mar 05 2007 Marcela Maslanova <mmaslano at redhat.com> 2.39-8
 - merge review


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/man-pages-fr/F-7/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Sep 2006 11:42:28 -0000	1.10
+++ sources	29 Apr 2008 13:11:24 -0000	1.11
@@ -1,2 +1,3 @@
-7e9ecdd134703e8172107124f1f3fec4  man-pages-fr-2.39.tar.bz2
-57109f5fec7005b0fd49dc84529244c1  mansupfr.tar.bz2
+b9fa51d7365a4c000cd443993d64ca85  man-pages-fr-2.79.0.tar.bz2
+92271db71d5e83bcf18838dbe70fff91  man-pages-extras-fr-0.7.11.tar.bz2
+57a28d5da5d8ec66b650039092fb5f1c  mansupfr.tar.bz2