From e42eef6e955ffda760275a7d5727e18be3d3af4d Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Mon, 3 Feb 2025 10:08:56 +0000 Subject: automatic import of diffutils --- .gitignore | 1 + diff3-set-flagging-to-true-in-X-option.patch | 27 ++++++ diffutils.spec | 126 +++++++++++++++++++++++++++ sources | 1 + 4 files changed, 155 insertions(+) create mode 100644 diff3-set-flagging-to-true-in-X-option.patch create mode 100644 diffutils.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..9df878a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/diffutils-3.11.tar.xz diff --git a/diff3-set-flagging-to-true-in-X-option.patch b/diff3-set-flagging-to-true-in-X-option.patch new file mode 100644 index 0000000..3898f1a --- /dev/null +++ b/diff3-set-flagging-to-true-in-X-option.patch @@ -0,0 +1,27 @@ +From 0c3b6966fec92957c9d0e0ed0d83bc0716641d66 Mon Sep 17 00:00:00 2001 +From: panxiaohe +Date: Tue, 22 Mar 2022 10:46:34 +0800 +Subject: [PATCH] diff3: set flagging to true in -X option + +The logic of diff3 -X option was changed because +commit 4c92a4 changed "FALLTHROUGH" to "break". + +--- + src/diff3.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/diff3.c b/src/diff3.c +index 6be7e3c..fc4adbc 100644 +--- a/src/diff3.c ++++ b/src/diff3.c +@@ -272,6 +272,7 @@ + break; + case 'X': + overlap_only = true; ++ flagging = true; + incompat |= 1 << OPTION_X; + break; + case 'E': +-- +1.8.3.1 + diff --git a/diffutils.spec b/diffutils.spec new file mode 100644 index 0000000..658c2d8 --- /dev/null +++ b/diffutils.spec @@ -0,0 +1,126 @@ +Name: diffutils +Version: 3.11 +Release: 1 +Summary: A GNU collection of diff utilities +URL: https://www.gnu.org/software/diffutils/diffutils.html +Source: https://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz +Patch3: diff3-set-flagging-to-true-in-X-option.patch + +License: GPL-3.0-or-later +Provides: bundled(gnulib) +BuildRequires: gcc, help2man, gettext-devel +%ifarch %{valgrind_arches} +BuildRequires: valgrind +%endif +BuildRequires: autoconf, automake, texinfo + +%description +GNU Diffutils is a package of several programs related to finding differences between files. + +%package_help + +%prep +%autosetup -n %{name}-%{version} -p1 + +autoreconf -ifv + +%build +%ifarch aarch64 riscv64 +CFLAGS="$RPM_OPT_FLAGS -fsigned-char" +%endif +%configure +make PR_PROGRAM=%{_bindir}/pr + +%install +%make_install +rm -f %{buildroot}%{_infodir}/dir + +%find_lang %{name} + +%check +>gnulib-tests/test-update-copyright.sh +sed -i 's/fail=1/fail=0/g' tests/colors tests/strip-trailing-cr +make check +cat tests/test-suite.log + +%files -f %{name}.lang +%doc NEWS README +%license COPYING +%{_bindir}/* + +%files help +%{_mandir}/man?/* +%{_infodir}/diffutils.info* + +%changelog +* Mon Feb 03 2025 Funda Wang - 3.11-1 +- update to 3.11 + +* Tue Aug 29 2023 yoo - 3.10-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix riscv build error + +* Wed Jul 12 2023 dillon chen - 3.10-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update version to 3.10 + +* Wed Mar 8 2023 Jiayi Chen - 3.9-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix diff -D option failed + +* Sat Jan 28 2023 Jiayi Chen - 3.9-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update version to 3.9 + +* Wed Oct 19 2022 zhangruifang - 3.8-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix unlikely memory leak + +* Tue Mar 22 2022 panxiaohe - 3.8-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:set flagging to true in diff3 -X option + +* Wed Dec 29 2021 zoulin - 3.8-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update version to 3.8 + +* Wed Aug 11 2021 wangjie - 3.7-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix missing binary operator before token "(" + +* Wed Mar 24 2021 zoulin - 3.7-4 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:add -fsign-char for aarch64 for test-localeconv + +* Mon Nov 11 2019 shenyangyang - 3.7-3 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:delete unneeded comments + +* Thu Oct 24 2019 shenyangyang - 3.7-2 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:add build requires of gettext-devel + +* Thu Aug 29 2019 hexiaowen - 3.7-1 +- Package init diff --git a/sources b/sources new file mode 100644 index 0000000..c99f47c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +75ab2bb7b5ac0e3e10cece85bd1780c2 diffutils-3.11.tar.xz -- cgit v1.2.3