diff --git a/man-pages-ja-fix-automake.patch b/man-pages-ja-fix-automake.patch deleted file mode 100644 index 98c379c..0000000 --- a/man-pages-ja-fix-automake.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -pruN man-pages-ja-20220415.orig/manual/GNU_automake/translation_list man-pages-ja-20220415/manual/GNU_automake/translation_list ---- man-pages-ja-20220415.orig/manual/GNU_automake/translation_list 2022-04-15 01:03:35.000000000 +0900 -+++ man-pages-ja-20220415/manual/GNU_automake/translation_list 2022-05-09 16:30:47.139880537 +0900 -@@ -1,4 +1,4 @@ --○:GNU automake:1.16.5:2021/10/03:aclocal-1.16:1:2021/11/13:::: -+○:GNU automake:1.16.5:2021/10/03:aclocal-1.16.1:1:2021/11/13:::: - ◎:GNU automake:1.16.5:2021/10/03:aclocal:1:aclocal-1.16:1::: --○:GNU automake:1.16.5:2021/10/03:automake-1.16:1:2021/11/13:::: -+○:GNU automake:1.16.5:2021/10/03:automake-1.16.1:1:2021/11/13:::: - ◎:GNU automake:1.16.5:2021/10/03:automake:1:automake-1.16:1::: diff --git a/man-pages-ja-fix-pkgs-list.patch b/man-pages-ja-fix-pkgs-list.patch index 975815f..f3f3d38 100644 --- a/man-pages-ja-fix-pkgs-list.patch +++ b/man-pages-ja-fix-pkgs-list.patch @@ -1,30 +1,16 @@ -diff -pruN man-pages-ja-20220415.orig/script/pkgs.list man-pages-ja-20220415/script/pkgs.list ---- man-pages-ja-20220415.orig/script/pkgs.list 2022-05-09 16:37:59.268999196 +0900 -+++ man-pages-ja-20220415/script/pkgs.list 2022-05-09 16:43:07.124372994 +0900 -@@ -7,13 +7,14 @@ - # (i.e. 優先される) ことになります。 - # - shadow Y -+GNU_automake Y - GNU_coreutils Y --gnumaniak Y - GNU_bash Y +diff -pruN man-pages-ja-20230915.orig/script/pkgs.list man-pages-ja-20230915/script/pkgs.list +--- man-pages-ja-20230915.orig/script/pkgs.list 2022-11-12 12:33:09.000000000 +0900 ++++ man-pages-ja-20230915/script/pkgs.list 2023-10-12 22:29:05.801946807 +0900 +@@ -12,7 +12,7 @@ GNU_bash Y GNU_bc Y GNU_binutils Y GNU_cpio Y - GNU_ed Y +-GNU_dejagnu Y +GNU_dejagnu N - GNU_diffutils N - GNU_fileutils N - GNU_findutils Y -@@ -38,66 +39,68 @@ GNU_texinfo Y - GNU_textutils N - GNU_uucp Y - LDP_man-pages Y -+gnumaniak Y - SysVinit Y - acl Y - apmd Y + GNU_autoconf Y + GNU_automake Y + GNU_bison Y +@@ -52,65 +52,65 @@ apmd Y at Y autofs Y bind Y @@ -37,12 +23,12 @@ diff -pruN man-pages-ja-20220415.orig/script/pkgs.list man-pages-ja-20220415/scr byacc Y bzip2 Y cdparanoia Y --cdrecord Y -+cdrecord N + cdrecord Y cron Y cups Y -cvsup Y +cvsup N + dblatex Y dhcp Y dhcp2 Y dhcpcd Y @@ -55,13 +41,12 @@ diff -pruN man-pages-ja-20220415.orig/script/pkgs.list man-pages-ja-20220415/scr eject Y expect Y -fdutils Y -+#fdutils Y ++fdutils N fetchmail Y file Y flex Y -fort77 Y +fort77 N -+gdb Y glibc-linuxthreads Y hdparm Y -ipchains Y @@ -71,6 +56,8 @@ diff -pruN man-pages-ja-20220415.orig/script/pkgs.list man-pages-ja-20220415/scr +ipchains-scripts N +ipfwadm N iptables Y + itstool Y + kmod Y ld.so Y -lids Y -lilo Y @@ -87,11 +74,11 @@ diff -pruN man-pages-ja-20220415.orig/script/pkgs.list man-pages-ja-20220415/scr +majordomo N +man N +man-db Y + meson Y microcode_ctl Y -mirrordir Y --module-init-tools Y +mirrordir N -+module-init-tools N + module-init-tools N modutils N mpg123 Y ncftp Y @@ -104,14 +91,15 @@ diff -pruN man-pages-ja-20220415.orig/script/pkgs.list man-pages-ja-20220415/scr +netkit N +nfs-server N nfs-utils Y + nginx Y pciutils Y -pcmcia-cs Y +pcmcia-cs N ppp Y procinfo Y procmail Y -@@ -105,7 +108,7 @@ procps Y - psmisc Y +@@ -119,7 +119,7 @@ psmisc Y + qpdf Y quota Y rdate Y -reiserfsprogs Y @@ -119,9 +107,9 @@ diff -pruN man-pages-ja-20220415.orig/script/pkgs.list man-pages-ja-20220415/scr rp-pppoe Y rpm Y rssh Y -@@ -114,18 +117,18 @@ sendmail Y - setserial Y +@@ -129,20 +129,20 @@ setserial Y smartmontools Y + subversion Y sudo Y -sysklogd Y +sysklogd N @@ -130,12 +118,14 @@ diff -pruN man-pages-ja-20220415.orig/script/pkgs.list man-pages-ja-20220415/scr tcsh Y -ucd-snmp Y +ucd-snmp N + upower Y util-linux Y uudeview Y vsftpd Y -wu-ftpd Y +wu-ftpd N xinetd Y + xz Y yp-tools Y ypbind N ypbind-mt Y diff --git a/man-pages-ja.spec b/man-pages-ja.spec index 90ee084..892d07e 100644 --- a/man-pages-ja.spec +++ b/man-pages-ja.spec @@ -1,33 +1,33 @@ Name: man-pages-ja -Version: 20220415 -Release: 4%{?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 +Version: 20230915 +Release: 1%{?dist} +# BSD-3-Clause - shadow, bsd-games, byacc, bzip2, dhcpcd, dump, file, hdparm, rssh, tcp_wrappers, tcsh +# GFDL-1.3-or-later - GNU_*, cron, glibc-linuxthreads +# BSD-4-Clause-UC/Linux-man-pages-copyleft/GPL-2.0-or-later/BSD-4.3TAHOE/Linux-man-pages-1-para/GPL-1.0-or-later/BSD-3-Clause/MIT/Spencer-94/LicenseRef-LDPL/BSD-2-Clause/LicenseRef-Fedora-UltraPermissive/LicenseRef-Fedora-Public-Domain - LDP_manpages, gnumaniak, ld.so +# GPL-2.0-or-later - 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 +# GPL-2.0-or-later and LGPL-2.1-or-later - cdparanoia +# Apache-2.0 WITH LLVM-exception AND BSD-3-Clause AND Zlib AND BSD-2-Clause - cups # ??? - microcode_ctl, procps -# Public Domain - expect -# GPL+ and Public Domain - fetchmail -# BSD and LGPLv2+ - flex -# LGPLv2+ - mpg123 -# Artistic clarified - ncftp +# LicenseRef-Fedora-Public-Domain - expect +# GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain - fetchmail +# BSD-3-Clause AND LGPL-2.0-or-later - flex +# GPL-2.0-or-later - mpg123 +# BSD-3-Clause - ncftp # MIT - ncurses -# MIT and GPLv2 and GPLv2+ and BSD - nfs-utils -# BSD and LGPLv2+ and GPLv2+ and Public Domain - ppp +# MIT and GPL-2.0-only and GPL-2.0-or-later and BSD-3-Clause - nfs-utils +# BSD-4.3TAHOE and LGPLv2+ and GPLv2+ and Public Domain - ppp # GPL+ - procinfo, setserial -# GPLv2+ or Artistic - procmail +# GPL-2.0-or-later or Artistic-1.0-Perl - procmail # BSD and GPLv2 and GPLv2+ - quota -# GPLv3+ - rsync +# GPL-3.0-or-later - rsync # Sendmail - sendmail -# BSD with advertising - tcpdump +# BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-UC AND ISC AND NTP - tcpdump # GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain - util-linux -# GPLv2 with exceptions - vsftpd +# GPL-2.0-only WITH vsftpd-openssl-exception - 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 +License: BSD-3-Clause AND GFDL-1.3-or-later AND BSD-4-Clause-UC AND Linux-man-pages-copyleft AND GPL-2.0-or-later AND BSD-4.3TAHOE AND Linux-man-pages-1-para AND GPL-1.0-or-later AND MIT AND Spencer-94 AND LicenseRef-LDPL AND BSD-2-Clause AND ISC AND LGPL-2.1-or-later AND Apache-2.0 WITH LLVM-exception AND Zlib AND LicenseRef-Fedora-Public-Domain AND LicenseRef-Fedora-UltraPermissive AND GPL-2.0-only AND LGPL-2.0-or-later AND (GPL-2.0-or-later OR Artistic-1.0-Perl) AND GPL-3.0-or-later AND Sendmail AND BSD-4-Clause AND NTP AND GPL-2.0-only WITH vsftpd-openssl-exception AND xinetd BuildArch: noarch BuildRequires: make BuildRequires: perl(Env), perl(Encode) @@ -41,7 +41,6 @@ Source4: %{name}-tar.1 Source5: %{name}-snmptrapd.8 Patch0: %{name}-fix-configure.perl.patch Patch1: %{name}-fix-pkgs-list.patch -Patch2: %{name}-fix-automake.patch Patch15: %{name}-358081-sysctl-warn.patch Patch18: %{name}-433692-printf.1.patch Patch21: %{name}-456263-top.1.patch @@ -158,6 +157,10 @@ done %changelog +* Thu Oct 12 2023 Akira TAGOH - 20230915-1 +- Updates to 20230915. +- Convert License tag to SPDX. + * Thu Jul 20 2023 Fedora Release Engineering - 20220415-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index b0f25d2..0ac9ff5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (man-pages-ja-20220415.tar.gz) = cb1e06db3f5a21f4446839a4818898d66bf4fb862b39c447090807512276be2dcdb506c0ac650772f869d7f6f724c57f6731ef68ffefefb3bc226679a6a69277 +SHA512 (man-pages-ja-20230915.tar.gz) = 1852f24f1eaf9a41c025dd14307ee73f923d0d210f4fd615275502561f2acf1d4db4e70399888de6d203828b007dad5eb150a642e7aa51784e45f08ce2448610