rpms/man-pages-fr/devel man-pages-fr.spec,1.20,1.21

[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-serv21573

Modified Files:
	man-pages-fr.spec 
Log Message:
New spec file for better encoding.



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- man-pages-fr.spec	21 Jul 2006 13:42:30 -0000	1.20
+++ man-pages-fr.spec	24 Jul 2006 09:55:35 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.22.0
-Release:	3
+Release:	4
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
@@ -34,26 +34,25 @@
   mkdir -p $RPM_BUILD_ROOT%{_mandir}/fr/man${n}
 done
 
-# Conversion to UTF-8 only when needed
+# gawk haven't coding, but it's in latin1
 for i in man?/*; do
-        iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new
-        mv -f $i.new $i
+  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
 done
-for i in man?; do
-        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
 
@@ -103,6 +102,9 @@
 %{_mandir}/fr/
 
 %changelog
+* Mon Jul 24 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-4
+- new spec file for better encoding
+
 * Fri Jul 21 2006 Marcela Maslanova <mmaslano at redhat.com> 2.22.0-3
 - deleting conflicts in man-pages