diff --git a/man-pages-ja-fix-pkgs-list.patch b/man-pages-ja-fix-pkgs-list.patch index 8bcdb72..7465eb7 100644 --- a/man-pages-ja-fix-pkgs-list.patch +++ b/man-pages-ja-fix-pkgs-list.patch @@ -17,3 +17,123 @@ diff -pruN man-pages-ja-20120715.orig/script/pkgs.list man-pages-ja-20120715/scr SysVinit Y acl Y apmd Y +diff -pruN man-pages-ja-20180715.orig/script/pkgs.list man-pages-ja-20180715/script/pkgs.list +--- man-pages-ja-20180715.orig/script/pkgs.list 2018-07-27 16:46:12.082186441 +0900 ++++ man-pages-ja-20180715/script/pkgs.list 2018-07-28 20:28:31.653878451 +0900 +@@ -43,60 +43,60 @@ apmd Y + at Y + autofs Y + bind Y +-bs Y +-bsd-games Y +-bsd-games-non-free Y ++bs N ++bsd-games N ++bsd-games-non-free N + byacc Y + bzip2 Y + cdparanoia Y +-cdrecord Y ++cdrecord N + cron Y + cups Y +-cvsup Y ++cvsup N + dhcp Y + dhcp2 Y + dhcpcd Y + dump Y + ebtables Y +-e2compr-ancillary Y ++e2compr-ancillary N + e2fsprogs Y + #efax Y + eject Y + expect Y +-fdutils Y ++#fdutils Y + fetchmail Y + file Y + flex Y +-fort77 Y ++fort77 N + glibc-linuxthreads Y + hdparm Y +-ipchains Y +-ipchains-scripts Y +-ipfwadm Y ++ipchains N ++ipchains-scripts N ++ipfwadm N + iptables Y + ld.so Y +-lids Y +-lilo Y +-linux-man9 Y ++lids N ++lilo N ++linux-man9 N + logrotate Y +-lpr-linux Y +-majordomo Y +-man Y +-man-db N ++lpr-linux N ++majordomo N ++man N ++man-db Y + microcode_ctl Y +-mirrordir Y +-module-init-tools Y ++mirrordir N ++module-init-tools N + modutils N + mpg123 Y + ncftp Y + ncurses Y + net-tools Y +-netatalk Y +-netkit Y +-nfs-server Y ++netatalk N ++netkit N ++nfs-server N + nfs-utils Y + pciutils Y +-pcmcia-cs Y ++pcmcia-cs N + ppp Y + procinfo Y + procmail Y +@@ -104,7 +104,7 @@ procps Y + psmisc Y + quota Y + rdate Y +-reiserfsprogs Y ++reiserfsprogs N + rp-pppoe Y + rpm Y + rssh Y +@@ -113,18 +113,18 @@ sendmail Y + setserial Y + smartmontools Y + sudo Y +-sysklogd Y ++sysklogd N + tcp_wrappers Y + tcpdump Y + tcsh Y +-ucd-snmp Y ++ucd-snmp N + util-linux Y + uudeview Y + vsftpd Y +-wu-ftpd Y ++wu-ftpd N + xinetd Y + yp-tools Y + ypbind N + ypbind-mt Y + ypserv Y +-zebedee Y ++zebedee N diff --git a/man-pages-ja.spec b/man-pages-ja.spec index ea8d71e..7f1f414 100644 --- a/man-pages-ja.spec +++ b/man-pages-ja.spec @@ -1,8 +1,33 @@ Name: man-pages-ja -Version: 20180315 -Release: 2%{?dist} -# Actual license for each Japanese manpages is the same to the original English manpages' license. -License: Freely redistributable without restriction +Version: 20180715 +Release: 1%{?dist} +# BSD - shadow, bsd-games, byacc, bzip2, dhcpcd, dump, file, hdparm, rssh, tcp_wrappers, tcsh +# GFDL - GNU_*, cron, glibc-linuxthreads +# GPL+/GPLv2+/BSD/MIT/Copyright only/IEEE - LDP_manpages, gnumaniak, ld.so +# GPLv2+ - SysVinit, acl, apmd, at, autofs, ebtables, eject, e2fsprogs, iptables, logrotate, man-db, net-tools, pciutils, psmisc, rdate, rp-pppoe, rpm, smartmontools, uudeview +# ISC - bind, dhcp, dhcp2, sudo +# GPLv2 and LGPLv2 - cdparanoia +# GPLv2+ and LGPLv2+ with exceptions and AML - cups +# ??? - microcode_ctl, procps +# Public Domain - expect +# GPL+ and Public Domain - fetchmail +# BSD and LGPLv2+ - flex +# LGPLv2+ - mpg123 +# Artistic clarified - ncftp +# MIT - ncurses +# MIT and GPLv2 and GPLv2+ and BSD - nfs-utils +# BSD and LGPLv2+ and GPLv2+ and Public Domain - ppp +# GPL+ - procinfo, setserial +# GPLv2+ or Artistic - procmail +# BSD and GPLv2 and GPLv2+ - quota +# GPLv3+ - rsync +# Sendmail - sendmail +# BSD with advertising - tcpdump +# GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain - util-linux +# GPLv2 with exceptions - vsftpd +# xinetd - xinetd +# GPLv2 - yp-tools, ypbind-mt, ypserv +License: BSD and GFDL and GPL+ and GPLv2+ and MIT and Copyright only and IEEE and ISC and GPLv2 and LGPLv2 and LGPLv2+ with exceptions and AML and Public Domain and LGPLv2+ and Artistic clarified and (GPLv2+ or Artistic) and GPLv3+ and Sendmail and BSD with advertising and GPLv2 with exceptions and xinetd BuildArch: noarch BuildRequires: perl(Env), perl(Encode) URL: http://linuxjm.osdn.jp/ @@ -82,10 +107,10 @@ if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/net-tools/man1/hostname.1 ]; th rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/hostname.1* install -p -m0644 $RPM_BUILD_DIR/%{name}-%{version}/manual/net-tools/man1/hostname.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/ fi -# For Bug#128612 -mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.telned.8.gz $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.telnetd.8.gz -# For Bug#128833 -mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.rlogin.8.gz $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.rlogind.8.gz +## For Bug#128612 +#mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.telned.8.gz $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.telnetd.8.gz +## For Bug#128833 +#mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.rlogin.8.gz $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.rlogind.8.gz # For Bug#551476 rm -rf $RPM_BUILD_ROOT%{_mandir}/ja/man1/tail.1* install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/ja/man1/tail.1 @@ -124,6 +149,11 @@ done %changelog +* Sat Jul 28 2018 Akira TAGOH - 20180715-1 +- Updates to 20180715. +- Update License tag. +- Drop some man pages we don't ship in Fedora. + * Fri Jul 13 2018 Fedora Release Engineering - 20180315-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild