rpms/man-pages-fr/devel man-pages-fr.spec,1.18,1.19

[fedora-cvs-commits at redhat.com]

Author: mmaslano

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21476

Modified Files:
	man-pages-fr.spec 
Log Message:
New version of man-pages-fr from upstream.

--- man-pages-fr-2.22.0/man1/aumix.1.mar        2006-07-19 09:04:55.000000000 +0200
+++ man-pages-fr-2.22.0/man1/aumix.1    2006-07-19 10:51:59.000000000 +0200
@@ -30,8 +30,9 @@
 .\" .Sh AUTHORS
 .\" .Sh BUGS
 .\"
+.TH AUMIX 1 "13 July 2000"
 .Dd July 13, 2000
 .Os
 .Dt AUMIX 1
 .Sh NOM
 .Nm aumix



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- man-pages-fr.spec	19 Jul 2006 13:04:15 -0000	1.18
+++ man-pages-fr.spec	19 Jul 2006 14:01:49 -0000	1.19
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.22.0
-Release:	0
+Release:	2
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -10,7 +10,6 @@
 Patch1:		man-pages-fr-aumix_missTH.patch  
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
-BuildRequires:  utrac
 
 %description
 Manual pages from the Linux Documentation Project, translated into French. Also
@@ -37,23 +36,26 @@
 
 # Conversion to UTF-8 only when needed
 for i in man?/*; do
-  CODING=`utrac -p ${i}`
-  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
+        iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new
+        mv -f $i.new $i
 done
-
-##make install-install DESTDIR=$RPM_BUILD_ROOT
-
 for i in man?; do
-    install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i;
+        install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i;
 done
-    
+                    
+#for i in man?/*; do
+#  CODING=`file -i ${i}`
+#  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
+#done
+
+##make install-install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove files already included in other packages
 # alsa-utils
@@ -99,7 +101,7 @@
 %{_mandir}/fr/
 
 %changelog
-* Wed Jul 19 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22-0
+* Wed Jul 19 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-2
 - make from sources from Alain Portal new version of French man-pages
 - man-pages-fr-aumix_missTH.patch - missed header
 - used Spec file for version 2.16 from Alain Portal