rpms/man-pages-ja/devel man-pages-ja-fix-uninitialized-value.patch, NONE, 1.1 man-pages-ja-missing-pkglist.patch, NONE, 1.1 man-pages-ja-timestamp.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 man-pages-ja.spec, 1.56, 1.57 rh-man-pages-ja.pl, 1.12, 1.13 sources, 1.47, 1.48 man-pages-ja-222495-swapon.2.patch, 1.1, NONE
Akira Tagoh (tagoh)
fedora-extras-commits at redhat.com
Fri Sep 28 04:28:44 UTC 2007
- Previous message (by thread): rpms/NetworkManager-vpnc/devel .cvsignore, 1.10, 1.11 NetworkManager-vpnc.spec, 1.24, 1.25 sources, 1.11, 1.12 NetworkManager-vpnc-0.6.4-keepalive.patch, 1.1, NONE NetworkManager-vpnc-0.6.4-options.patch, 1.1, NONE
- Next message (by thread): rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.25,1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tagoh
Update of /cvs/pkgs/rpms/man-pages-ja/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8375
Modified Files:
.cvsignore man-pages-ja.spec rh-man-pages-ja.pl sources
Added Files:
man-pages-ja-fix-uninitialized-value.patch
man-pages-ja-missing-pkglist.patch
man-pages-ja-timestamp.patch
Removed Files:
man-pages-ja-222495-swapon.2.patch
Log Message:
* Thu Sep 27 2007 Akira TAGOH <tagoh at redhat.com> - 20070915-1
- updates to 20070915.
- remove man-pages-ja-222495-swapon.2.patch so that it's no longer needed.
- clean up the spec file.
- fix some warnings in perl script.
man-pages-ja-fix-uninitialized-value.patch:
--- NEW FILE man-pages-ja-fix-uninitialized-value.patch ---
diff -ruN man-pages-ja-20070915.orig/script/configure.perl man-pages-ja-20070915/script/configure.perl
--- man-pages-ja-20070915.orig/script/configure.perl 2007-09-27 16:34:19.000000000 +0900
+++ man-pages-ja-20070915/script/configure.perl 2007-09-27 16:36:44.000000000 +0900
@@ -119,6 +119,7 @@
chomp;
my @l = split /:/;
$l[1] =~ s/ /_/e;
+ unless (exists $main::pw{$l[1]} && defined $main::pw{$l[1]}) {die "Missing `$l[1]' in pkg.list";}
if ($main::pw{$l[1]} == -1) {next;}
(my $sec, my $osec) = split /=>/, $l[5];
if ($sec eq "pod"){$sec = $podsec;}
man-pages-ja-missing-pkglist.patch:
--- NEW FILE man-pages-ja-missing-pkglist.patch ---
diff -ruN man-pages-ja-20070915.orig/script/pkgs.list man-pages-ja-20070915/script/pkgs.list
--- man-pages-ja-20070915.orig/script/pkgs.list 2006-06-13 01:25:37.000000000 +0900
+++ man-pages-ja-20070915/script/pkgs.list 2007-09-27 16:30:06.000000000 +0900
@@ -65,6 +65,7 @@
flex Y
glibc-linuxthreads Y
fort77 Y
+hdparm Y
ipfwadm Y
ipchains Y
iptables Y
@@ -77,6 +78,7 @@
man-db N
microcode_ctl Y
mirrordir Y
+module-init-tools Y
modutils Y
mpg123 Y
ncftp Y
@@ -89,6 +91,7 @@
pciutils Y
pcmcia-cs Y
procinfo Y
+procmail Y
procps Y
ppp Y
psmisc Y
@@ -96,6 +99,7 @@
reiserfsprogs Y
rdate Y
rp-pppoe Y
+rpm Y
rssh Y
sendmail Y
setserial Y
@@ -107,6 +111,7 @@
ucd-snmp Y
util-linux Y
uudeview Y
+vsftpd Y
xinetd Y
yp-tools Y
ypbind N
man-pages-ja-timestamp.patch:
--- NEW FILE man-pages-ja-timestamp.patch ---
diff -ruN man-pages-ja-20070915.orig/script/configure.perl man-pages-ja-20070915/script/configure.perl
--- man-pages-ja-20070915.orig/script/configure.perl 2007-09-27 16:49:10.000000000 +0900
+++ man-pages-ja-20070915/script/configure.perl 2007-09-27 16:50:09.000000000 +0900
@@ -212,7 +212,7 @@
my $mandst = "$MANROOT/man$sec";
print ISS "echo -n install $pkg: $name.$sec .. \n";
- print ISS "install -m 644 $mansrc $mandst\n";
+ print ISS "install -m 644 -p $mansrc $mandst\n";
print ISS "echo -n converting to UTF-8 .. \n";
print ISS "iconv -f euc-jp -t utf-8 $mandst/$name.$sec > $mandst/$name.$sec.tmp && mv $mandst/$name.$sec.tmp $mandst/$name.$sec\n";
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore 17 Aug 2007 04:48:25 -0000 1.48
+++ .cvsignore 28 Sep 2007 04:28:12 -0000 1.49
@@ -35,3 +35,4 @@
man-pages-ja-20070615.tar.gz
man-pages-ja-20070715.tar.gz
man-pages-ja-20070815.tar.gz
+man-pages-ja-20070915.tar.gz
Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- man-pages-ja.spec 17 Aug 2007 03:56:24 -0000 1.56
+++ man-pages-ja.spec 28 Sep 2007 04:28:12 -0000 1.57
@@ -1,16 +1,15 @@
-%define manver 20070815
%define use_utf8 1
Name: man-pages-ja
-Version: %{manver}
-Release: 1
+Version: 20070915
+Release: 1%{?dist}
# Actual license for each Japanese manpages is the same to the original English manpages' license.
License: Freely redistributable without restriction
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
URL: http://www.linux.or.jp/JM/
-Source: http://www.linux.or.jp/JM/%{name}-%{manver}.tar.gz
+Source: http://www.linux.or.jp/JM/%{name}-%{version}.tar.gz
Source1: rh-man-pages-ja.pl
Patch: %{name}-20010515-rh.patch
Patch1: %{name}-20011115-fixpipe.patch
@@ -19,7 +18,9 @@
Patch8: man-pages-ja-20050215-ls.patch
Patch9: man-pages-ja-20060815-204667-nfs.5.patch
Patch11: man-pages-ja-20060815-178955-at.1.patch
-Patch12: man-pages-ja-222495-swapon.2.patch
+Patch12: man-pages-ja-missing-pkglist.patch
+Patch13: man-pages-ja-fix-uninitialized-value.patch
+Patch14: man-pages-ja-timestamp.patch
Summary: Japanese man (manual) pages from the Japanese Manual Project
Group: Documentation
@@ -27,7 +28,7 @@
Japanese Manual pages, translated by JM-Project (Japanese Manual Project).
%prep
-%setup -q -n %{name}-%{manver}
+%setup -q -n %{name}-%{version}
%patch -p1 -b .jp
%patch1 -p1 -b .pipe
%if %{use_utf8}
@@ -37,15 +38,17 @@
%patch8 -p1 -b .ls
%patch9 -p1 -b .nfs
%patch11 -p1 -b .at
-%patch12 -p1 -b .swapon
+%patch12 -p1 -b .pkglist
+%patch13 -p1 -b .uninitval
+%patch14 -p1 -b .timestamp
%build
-perl %{SOURCE1} $RPM_BUILD_ROOT | make
+perl %{SOURCE1} '$DESTDIR' | make
%install
rm -fr $RPM_BUILD_ROOT
-sh ./installman.sh
+DESTDIR=$RPM_BUILD_ROOT sh ./installman.sh
rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/{chage.1,gpasswd.1,sg.1,apropos.1,man.1,whatis.1,newgrp.1}*
rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man5/{faillog.5,shadow.5,login.defs.5}*
@@ -91,7 +94,11 @@
package=`basename \`dirname $i\``;
name=`basename $i`;
if [ -s $i ]; then
+%if %{use_utf8}
+ iconv -f euc-jp -t utf-8 $i > $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name;
+%else
cp -a $i $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name;
+%endif
fi
done
)
@@ -100,12 +107,18 @@
rm -fr $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-, root, root, -)
%doc README translation_lists
%{_mandir}/ja/*
%changelog
+* Thu Sep 27 2007 Akira TAGOH <tagoh at redhat.com> - 20070915-1
+- updates to 20070915.
+ - remove man-pages-ja-222495-swapon.2.patch so that it's no longer needed.
+- clean up the spec file.
+- fix some warnings in perl script.
+
* Fri Aug 17 2007 Akira TAGOH <tagoh at redhat.com> - 20070815-1
- updates to 20070815.
Index: rh-man-pages-ja.pl
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/rh-man-pages-ja.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rh-man-pages-ja.pl 17 Aug 2006 11:14:40 -0000 1.12
+++ rh-man-pages-ja.pl 28 Sep 2007 04:28:12 -0000 1.13
@@ -15,7 +15,7 @@
###
# Maintainer should update these number according to the original Makefile
###
-for($i=0; $i<=104; $i++) {
+for($i=0; $i<=109; $i++) {
print "\n";
}
print "C\n";
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 17 Aug 2007 04:48:25 -0000 1.47
+++ sources 28 Sep 2007 04:28:12 -0000 1.48
@@ -1 +1 @@
-b6c9d323622ac251f4143f7f7fdde4c9 man-pages-ja-20070815.tar.gz
+40af705db14a4ef92bacc0d3e78a4aff man-pages-ja-20070915.tar.gz
--- man-pages-ja-222495-swapon.2.patch DELETED ---
- Previous message (by thread): rpms/NetworkManager-vpnc/devel .cvsignore, 1.10, 1.11 NetworkManager-vpnc.spec, 1.24, 1.25 sources, 1.11, 1.12 NetworkManager-vpnc-0.6.4-keepalive.patch, 1.1, NONE NetworkManager-vpnc-0.6.4-options.patch, 1.1, NONE
- Next message (by thread): rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.25,1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list