rpms/man-pages-es/F-8 man-pages-es.spec,1.17,1.18

[Ding-Yi Chen (dchen)]

Author: dchen

Update of /cvs/pkgs/rpms/man-pages-es/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26749/F-8

Modified Files:
	man-pages-es.spec 
Log Message:
[Bug 226124]  Merge Review: man-pages-es (comment 10)


Index: man-pages-es.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-es/F-8/man-pages-es.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- man-pages-es.spec	5 Dec 2007 03:52:50 -0000	1.17
+++ man-pages-es.spec	7 Dec 2007 03:09:53 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Spanish man pages from the Linux Documentation Project
 Name: man-pages-es
 Version: 1.55
-Release: 3%{?dist}
+Release: 4%{?dist}
 # These man pages come under various copyrights.
 # All are freely distributable when the nroff source is included.
 License: IEEE
@@ -55,60 +55,47 @@
 %prep
 %setup -q -a 1
 
-%build
 for i in README LEEME.extra PAQUETES PROYECTO; do
     iconv -f ISO8859-15 -t UTF-8 %{extra_pkg_name}/$i -o %{extra_pkg_name}/$i.utf8
     mv  %{extra_pkg_name}/$i.utf8 %{extra_pkg_name}/$i
 done
-mv %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/README %{_builddir}/%{name}-%{version}/README.extra
-cp %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/LEEME.extra %{_builddir}/%{name}-%{version}/
-cp %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/PAQUETES %{_builddir}/%{name}-%{version}/
-cp %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/PROYECTO %{_builddir}/%{name}-%{version}/
+mv %{extra_pkg_name}/README %{extra_pkg_name}/README.extra
 
 # Bug 388391
-rm %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/man1/mc.1
-rm %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/man1/newgrp.1
+rm %{extra_pkg_name}/man1/mc.1
+rm %{extra_pkg_name}/man1/newgrp.1
 # Bug 226124
 for i in man3/dlopen.3 man5/acct.5 man5/host.conf.5 man5/resolver.5 man8/ld.so.8; do
-    iconv -f UTF-8 -t UTF-8 %{_builddir}/%{name}-%{version}/$i -o %{_builddir}/%{name}-%{version}/$i.utf8
-    mv %{_builddir}/%{name}-%{version}/$i.utf8 %{_builddir}/%{name}-%{version}/$i
-    rm %{_builddir}/%{name}-%{version}/%{extra_pkg_name}/$i
+    iconv -f UTF-8 -t UTF-8 $i -o $i.utf8
+    mv $i.utf8 $i
+    rm %{extra_pkg_name}/$i
 done
 
 for i in man-pages-1.55.Announce man7/iso_8859-7.7; do
-    iconv -f ISO8859-15 -t UTF-8 %{_builddir}/%{name}-%{version}/$i -o %{_builddir}/%{name}-%{version}/$i.utf8
-    mv %{_builddir}/%{name}-%{version}/$i.utf8 %{_builddir}/%{name}-%{version}/$i
+    iconv -f ISO8859-15 -t UTF-8 $i -o $i.utf8
+    mv $i.utf8 $i
 done
 
-for i in %{extra_pkg_name}/man*/*; do
-    iconv -f ISO8859-15 -t UTF-8 %{_builddir}/%{name}-%{version}/$i -o %{_builddir}/%{name}-%{version}/$i.utf8
-    mv %{_builddir}/%{name}-%{version}/$i.utf8 %{_builddir}/%{name}-%{version}/$i
+for j in 1 1x 2 3 4 5 6 7 8 9; do
+    for i in `find %{extra_pkg_name} -type f -name \*.$j`; do
+        iconv -f ISO8859-15 -t UTF-8 $i -o $i.utf8
+        mv $i.utf8 $i
+    done
 done
 
 
+%build
+
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT
+make install MANDIR=$RPM_BUILD_ROOT%{_mandir}/es
 make -C %{extra_pkg_name} MANDIR=$RPM_BUILD_ROOT%{_mandir}/es
 rm $RPM_BUILD_ROOT%{_mandir}/es/LEEME.extra
 rm $RPM_BUILD_ROOT%{_mandir}/es/PAQUETES
 rm $RPM_BUILD_ROOT%{_mandir}/es/PROYECTO
 
-
-#rm -fr $RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT%{_mandir}/es
-#for n in 1 2 3 4 5 6 7 8 9 n; do
-#    mkdir $RPM_BUILD_ROOT%{_mandir}/es/man$n
-#done
-#for i in man*/*; do
-#    iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new
-#    mv -f $i.new $i
-#done
-#for i in man?; do 
-#    install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/es/$i; 
-#done
-  
 %clean
 rm -fr $RPM_BUILD_ROOT
 
@@ -1422,7 +1409,7 @@
 
 %files extra
 %defattr(-,root,root,-)
-%doc LEEME.extra README.extra PAQUETES PROYECTO
+%doc %{extra_pkg_name}/LEEME.extra %{extra_pkg_name}/README.extra %{extra_pkg_name}/PAQUETES %{extra_pkg_name}/PROYECTO
 %{_mandir}/es/man1/addr2line.1.gz
 %{_mandir}/es/man1/ansi2knr.1.gz
 %{_mandir}/es/man1/ar.1.gz
@@ -1720,6 +1707,10 @@
 
 
 %changelog
+* Fri Dec 06 2007 Ding-Yi Chen <dchen at redhat.com> - 1.55-4
+- [Bug 226124]  Merge Review: man-pages-es (comment 10)
+- Fix improper SPEC file
+
 * Wed Dec 06 2007 Ding-Yi Chen <dchen at redhat.com> - 1.55-3
 - Change the Licence from "Freely redistributable without restriction" to IEEE