diff --git a/.gitignore b/.gitignore index 020a76f..b6ade6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1,2 @@ -yash-2.22.tar.gz -yash-doc-2.22-ja.tar.gz -yash-2.23.tar.gz -yash-doc-2.23-ja.tar.gz -/yash-2.24.tar.gz -/yash-doc-2.24-ja.tar.gz -/yash-2.25.tar.gz -/yash-doc-2.25-ja.tar.gz -/yash-2.26.1.tar.gz -/yash-doc-2.26-ja.tar.gz -/yash-2.27.tar.gz -/yash-doc-2.27-ja.tar.gz -/yash-2.28.tar.gz -/yash-doc-2.28-ja.tar.gz -/yash-2.29.tar.gz -/yash-doc-2.29-ja.tar.gz -/yash-2.30.tar.gz -/yash-doc-2.30-ja.tar.gz -/yash-2.31.tar.gz -/yash-doc-2.31-ja.tar.gz -/yash-2.32.1.tar.gz -/yash-2.33.tar.gz -/yash-2.33.1.tar.gz -/yash-2.34.tar.xz -/yash-2.35.tar.xz -/yash-2.36.tar.xz -/yash-2.37.tar.xz -/yash-2.38.tar.xz -/yash-2.39.tar.xz -/yash-2.40.tar.xz -/yash-2.41.tar.xz -/yash-2.43.tar.xz -/yash-2.44.tar.xz -/yash-2.45.tar.xz -/yash-2.46.tar.xz -/yash-2.47.tar.xz -/yash-2.48.tar.xz -/yash-2.49.tar.xz -/yash-2.50.tar.xz -/yash-2.51.tar.xz -/yash-2.52.tar.xz +/yash-*.tar.xz +/yash-*.tar.gz diff --git a/sources b/sources index c0c8bb3..f07dc6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yash-2.52.tar.xz) = 1024ff7e3cce6e64cbc0bd5c0d04a9863d0d51013baf07723d09562b156d05dbfe1fc2df5b736cdec5f562c56ad634f865554a1fe5aeeed91ec0d9276667f02a +SHA512 (yash-2.61.tar.gz) = 80362496a11b79dad0de13b75a9083397d684758cdf744622b94f34f7dd6e0db685c8786f74efb52dddcf9ad6d7ad50017b7940fb10f368a4c7f433ff5182d39 diff --git a/yash.spec b/yash.spec index dcf5a00..605496b 100644 --- a/yash.spec +++ b/yash.spec @@ -2,29 +2,26 @@ # Upstream is currently using SVN # SVN path: http://svn.sourceforge.jp/svnroot/yash/yash/trunk -%global repoid 76153 -%global mainver 2.52 +%global mainver 2.61 %global docver %{mainver} -%if 0%{?fedora} >= 20 %global yashdocdir %{_datadir}/doc/%{name}-doc -%else -%global yashdocdir %{_datadir}/doc/%{name}-doc-%{version} -%endif -%global mainrel 1 +%global baserelease 2 %undefine minorver %undefine _changelog_trimtime Name: yash Version: %{mainver} -Release: %{?minorver:0.}%{mainrel}%{?minorver:.%{minorver}}%{?dist} +Release: %{?minorver:0.}%{baserelease}%{?minorver:.%{minorver}}%{?dist} Summary: Yet Another SHell -License: GPLv2+ -URL: http://yash.osdn.net/ -Source0: http://osdn.dl.osdn.net/yash/%{repoid}/%{name}-%{version}%{?minorver}.tar.xz -#Source1: http://dl.osdn.jp/yash/%{repoid}/%{name}-doc-%{docver}%{?minorver}-ja.tar.gz +# License header in .c files are GPL-2.0-or-later +# However, doc/intro.txt says this is under GPL-2.0-only +# SPDX confirmed +License: GPL-2.0-only +URL: https://github.com/magicant/yash/ +Source0: https://github.com/magicant/yash/archive/%{version}/%{name}-%{version}%{?minorver}.tar.gz # Patches @@ -32,6 +29,10 @@ BuildRequires: make BuildRequires: gcc BuildRequires: ncurses-devel BuildRequires: ed +BuildRequires: /usr/bin/a2x +BuildRequires: /usr/bin/asciidoc +BuildRequires: /usr/bin/xgettext +BuildRequires: /usr/bin/ps Provides: /bin/yash # Write needed Requires for scriptlets explicitly Requires(post): grep @@ -54,7 +55,7 @@ Yash also has its own features beyond POSIX, such as: %package doc Summary: Documentation for %{name} Version: %{docver} -License: CC-BY-SA +License: CC-BY-SA-2.1-JP BuildArch: noarch Requires: %{name} = %{mainver}-%{release} #Requires: %{name} >= %{version} @@ -68,22 +69,14 @@ This package contains document files for %{name}. %build # This package use configure not based on autotools... # won't accept --libdir= -env \ - CC="%{__cc}" \ - CFLAGS="%{optflags}" \ - \ - ./configure \ +./configure \ --prefix=%{_prefix} \ --exec-prefix=%{_exec_prefix} \ -%if 0%{?fedora} >= 17 --bindir=%{_bindir} \ -%else - --bindir=/bin \ -%endif --datarootdir=%{_datarootdir} \ --docdir=%{yashdocdir}/ \ -make -k %{?_smp_mflags} +%make_build -k %install make install install-html \ @@ -118,12 +111,11 @@ sed -i -e '\@/bin/yash$@d' %{_sysconfdir}/shells exit 0 %files -f %name.lang -%defattr(-,root,root,-) %license COPYING %doc NEWS -%doc README +%doc README.md %lang(ja) %doc NEWS.ja -%lang(ja) %doc README.ja +%lang(ja) %doc README.ja.md %{_bindir}/%{name} @@ -136,13 +128,72 @@ exit 0 %lang(ja) %{_mandir}/ja/man1/yash.1* %files doc -%defattr(-,root,root,-) %dir %{yashdocdir}/ %{yashdocdir}/*.html %{yashdocdir}/*.css %lang(ja) %{yashdocdir}/ja/ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.61-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Thu Mar 05 2026 Mamoru TASAKA - 2.61-1 +- 2.61 + +* Sat Jan 17 2026 Fedora Release Engineering - 2.60-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Sep 17 2025 Mamoru TASAKA - 2.60-1 +- 2.60 + +* Fri Jul 25 2025 Fedora Release Engineering - 2.59-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu May 15 2025 Mamoru TASAKA - 2.59-1 +- 2.59 + +* Tue Feb 04 2025 Mamoru TASAKA - 2.58.1-1 +- 2.58.1 + +* Mon Feb 03 2025 Mamoru TASAKA - 2.58-2 +- 2.58 + +* Sun Jan 19 2025 Fedora Release Engineering - 2.57-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Aug 06 2024 Mamoru TASAKA - 2.57-1 +- 2.57 + +* Sat Jul 20 2024 Fedora Release Engineering - 2.56.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Mar 21 2024 Mamoru TASAKA - 2.56.1-1 +- 2.56.1 + +* Sat Jan 27 2024 Fedora Release Engineering - 2.55-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Aug 21 2023 Mamoru TASAKA - 2.55-1 +- 2.55 + +* Sat Jul 22 2023 Mamoru TASAKA - 2.54-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Feb 27 2023 Mamoru TASAKA - 2.54-1 +- 2.54 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.53-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Aug 28 2022 Mamoru TASAKA - 2.53-1 +- 2.53 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.52-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.52-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Oct 14 2021 Mamoru TASAKA - 2.52-1 - 2.52