rpms/man-pages-ru/devel manpages-0.97-0.98.diff, NONE, 1.1 .cvsignore, 1.6, 1.7 man-pages-ru.spec, 1.23, 1.24 sources, 1.6, 1.7

[nucleo]

Author: nucleo

Update of /cvs/pkgs/rpms/man-pages-ru/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2742

Modified Files:
	.cvsignore man-pages-ru.spec sources 
Added Files:
	manpages-0.97-0.98.diff 
Log Message:
Update to 0.98

manpages-0.97-0.98.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'manpages-0.97-0.98.diff'

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ru/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 May 2010 10:50:23 -0000	1.6
+++ .cvsignore	24 Jul 2010 23:53:14 -0000	1.7
@@ -1,4 +1,2 @@
-manpages-ru-0.7.tar.gz
-manpages-ru-0.97.tar.bz2
 manpages-ru-0.97.rh.tar.bz2
-man-pages-ru_3.24-2059-1223-20100508.tar.bz2
+man-pages-ru_3.25-2064-1352-20100717.tar.bz2


Index: man-pages-ru.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ru/devel/man-pages-ru.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- man-pages-ru.spec	11 May 2010 10:50:23 -0000	1.23
+++ man-pages-ru.spec	24 Jul 2010 23:53:15 -0000	1.24
@@ -1,15 +1,18 @@
-%global mpr_version 3.24-2059-1223-20100508
+%global mpr_version 3.25-2064-1352-20100717
 Summary: Russian man pages from the Linux Documentation Project
 Name: man-pages-ru
-Version: 0.97
-Release: 10%{?dist}
+Version: 0.98
+Release: 1%{?dist}
 # Source1 has GFDL license
 License: BSD and GPL+ and MIT and GFDL
 Group: Documentation
 URL: http://linuxshare.ru/projects/trans/
 # this is fedora only tarball
-Source: manpages-ru-%{version}.rh.tar.bz2
-Source1: http://downloads.sourceforge.net/%{name}/%{name}_%{mpr_version}.tar.bz2 
+Source: manpages-ru-0.97.rh.tar.bz2
+# Sources update to 0.98 http://linuxshare.ru/projects/trans/manpages-0.97-0.98.diff.bz2
+Patch0: manpages-0.97-0.98.diff
+# Sources from Man-pages-ru project http://man-pages-ru.sourceforge.net/
+Source1: http://downloads.sourceforge.net/%{name}/%{name}_%{mpr_version}.tar.bz2
 Requires: man-pages-reader
 # old download sites are not working now
 # http://alexm.here.ru/manpages-ru/download/
@@ -22,11 +25,25 @@ Manual pages from the Linux Documentatio
 Russian.
 
 %prep
-%setup -q -n manpages-ru-%{version}.rh -a 1
+%setup -q -n manpages-ru-0.97.rh -a 1
+%patch0 -p1
+
+iconv -f koi8-r -t UTF-8 < NEWS > NEWS.new
+mv -f NEWS.new NEWS
+
+for i in man?/*; do
+        iconv -f koi8-r -t UTF-8 < $i > $i.new
+        mv -f $i.new $i
+done
+
 # remove bogus pages from Source1:
 rm man-pages-ru_%{mpr_version}/man2/gethostid.2
 rm man-pages-ru_%{mpr_version}/man2/sethostid.2
+rm man-pages-ru_%{mpr_version}/man2/setregid.2
 rm man-pages-ru_%{mpr_version}/man5/ipc.5
+rm man-pages-ru_%{mpr_version}/man4/fifo.4
+rm man-pages-ru_%{mpr_version}/man5/complex.5
+rm man-pages-ru_%{mpr_version}/man5/environ.5
 
 # move Source1 to ./ directory
 for i in $(ls man-pages-ru_%{mpr_version});
@@ -57,12 +74,7 @@ done
 
 %install
 rm -fr $RPM_BUILD_ROOT
-iconv -f koi8-r -t UTF-8 < NEWS > NEWS.new
-mv -f NEWS.new NEWS
-for i in man*/*; do
-        iconv -f koi8-r -t UTF-8 < $i > $i.new
-        mv -f $i.new $i
-done
+
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
 LC_ALL=ru_RU make install INSTALLPATH=$RPM_BUILD_ROOT/%{_mandir} \
     LANG_SUBDIR=ru
@@ -76,6 +88,11 @@ rm -fr $RPM_BUILD_ROOT
 %{_mandir}/ru/man*/*
 
 %changelog
+* Fri Jul 23 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.98-1
+- updated Source to 0.98 (0.97-0.98 patch)
+- updated Source1 to 3.25-2064-1352-20100717
+- moved encoding converting to prep section
+
 * Tue May 11 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 0.97-10
 - add new source (Source1)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ru/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 May 2010 10:50:23 -0000	1.6
+++ sources	24 Jul 2010 23:53:15 -0000	1.7
@@ -1,4 +1,2 @@
-bfd5a8f20a12b994e19cfca0c4a21249  manpages-ru-0.7.tar.gz
-0496e600fed4a218f3dd896cfff49e4b  manpages-ru-0.97.tar.bz2
 1dc21326f604b18db20acfffb334eee9  manpages-ru-0.97.rh.tar.bz2
-cbbe70373776f40a757f70e899d2abb3  man-pages-ru_3.24-2059-1223-20100508.tar.bz2
+769ba927be8e587b470b872bb5925af8  man-pages-ru_3.25-2064-1352-20100717.tar.bz2