rpms/man-pages-ru/devel .cvsignore, 1.5, 1.6 man-pages-ru.spec, 1.22, 1.23 sources, 1.5, 1.6

[Ivana Varekova]

Author: varekova

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

Modified Files:
	.cvsignore man-pages-ru.spec sources 
Log Message:
- add new source (Source1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ru/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	21 Oct 2004 20:48:43 -0000	1.5
+++ .cvsignore	11 May 2010 10:50:23 -0000	1.6
@@ -1,3 +1,4 @@
 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


Index: man-pages-ru.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ru/devel/man-pages-ru.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- man-pages-ru.spec	16 Apr 2010 09:40:47 -0000	1.22
+++ man-pages-ru.spec	11 May 2010 10:50:23 -0000	1.23
@@ -1,12 +1,15 @@
+%global mpr_version 3.24-2059-1223-20100508
 Summary: Russian man pages from the Linux Documentation Project
 Name: man-pages-ru
 Version: 0.97
-Release: 9%{?dist}
-License: BSD and GPL+ and MIT
+Release: 10%{?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 
 Requires: man-pages-reader
 # old download sites are not working now
 # http://alexm.here.ru/manpages-ru/download/
@@ -19,7 +22,36 @@ Manual pages from the Linux Documentatio
 Russian.
 
 %prep
-%setup -q -n manpages-ru-%{version}.rh
+%setup -q -n manpages-ru-%{version}.rh -a 1
+# 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}/man5/ipc.5
+
+# move Source1 to ./ directory
+for i in $(ls man-pages-ru_%{mpr_version});
+do
+  if [ -d $i ]
+  then
+    mv man-pages-ru_%{mpr_version}/$i/* $i
+  else
+    mv man-pages-ru_%{mpr_version}/$i ./
+  fi
+done
+rmdir man-pages-ru_%{mpr_version}/man*/
+rmdir man-pages-ru_%{mpr_version}
+
+# remove .so links to nonexisting pages
+for mdir in $(ls ./ | grep man); do
+  for mfile in $(find $mdir/*.[0-9] -size 1); do
+    if [ $(wc -l $mfile | sed 's| .*||') -eq 1 ]; then
+      so_link=$(sed 's|.so ||' $mfile);
+      if ( ! [ -e $so_link ] ); then
+        rm $mfile
+      fi
+    fi
+  done
+done
 
 %build
 
@@ -40,10 +72,13 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc NEWS README
+%doc NEWS README License
 %{_mandir}/ru/man*/*
 
 %changelog
+* Tue May 11 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 0.97-10
+- add new source (Source1)
+
 * Fri Apr 16 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 0.97-9
 - add man-pages-reader dependence
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ru/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	21 Oct 2004 20:48:43 -0000	1.5
+++ sources	11 May 2010 10:50:23 -0000	1.6
@@ -1,3 +1,4 @@
 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