Compare commits
No commits in common. "rawhide" and "f42" have entirely different histories.
4 changed files with 121 additions and 53 deletions
106
grep-3.11-tests-drop.patch
Normal file
106
grep-3.11-tests-drop.patch
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in
|
||||
index 3d0ba78..cc01ad9 100644
|
||||
--- a/gnulib-tests/Makefile.in
|
||||
+++ b/gnulib-tests/Makefile.in
|
||||
@@ -188,7 +188,6 @@ TESTS = test-accept$(EXEEXT) test-alignasof$(EXEEXT) \
|
||||
test-strerror_r$(EXEEXT) test-striconv$(EXEEXT) \
|
||||
test-string$(EXEEXT) test-strnlen$(EXEEXT) \
|
||||
test-strstr$(EXEEXT) test-strtoimax$(EXEEXT) \
|
||||
- test-strtoll$(EXEEXT) test-strtoull$(EXEEXT) \
|
||||
test-strtoumax$(EXEEXT) test-symlink$(EXEEXT) \
|
||||
test-sys_ioctl$(EXEEXT) test-sys_select$(EXEEXT) \
|
||||
test-sys_socket$(EXEEXT) test-sys_stat$(EXEEXT) \
|
||||
@@ -284,7 +283,6 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alignasof$(EXEEXT) \
|
||||
test-strerror_r$(EXEEXT) test-striconv$(EXEEXT) \
|
||||
test-string$(EXEEXT) test-strnlen$(EXEEXT) \
|
||||
test-strstr$(EXEEXT) test-strtoimax$(EXEEXT) \
|
||||
- test-strtoll$(EXEEXT) test-strtoull$(EXEEXT) \
|
||||
test-strtoumax$(EXEEXT) test-symlink$(EXEEXT) \
|
||||
test-sys_ioctl$(EXEEXT) test-sys_select$(EXEEXT) \
|
||||
test-sys_socket$(EXEEXT) test-sys_stat$(EXEEXT) \
|
||||
@@ -6381,20 +6379,6 @@ test-strtoimax.log: test-strtoimax$(EXEEXT)
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-test-strtoll.log: test-strtoll$(EXEEXT)
|
||||
- @p='test-strtoll$(EXEEXT)'; \
|
||||
- b='test-strtoll'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-test-strtoull.log: test-strtoull$(EXEEXT)
|
||||
- @p='test-strtoull$(EXEEXT)'; \
|
||||
- b='test-strtoull'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
test-strtoumax.log: test-strtoumax$(EXEEXT)
|
||||
@p='test-strtoumax$(EXEEXT)'; \
|
||||
b='test-strtoumax'; \
|
||||
diff --git a/gnulib-tests/gnulib.mk b/gnulib-tests/gnulib.mk
|
||||
index 3556ae5..06a70c3 100644
|
||||
--- a/gnulib-tests/gnulib.mk
|
||||
+++ b/gnulib-tests/gnulib.mk
|
||||
@@ -1942,22 +1942,6 @@ EXTRA_DIST += test-strtoimax.c signature.h macros.h
|
||||
|
||||
## end gnulib module strtoimax-tests
|
||||
|
||||
-## begin gnulib module strtoll-tests
|
||||
-
|
||||
-TESTS += test-strtoll
|
||||
-check_PROGRAMS += test-strtoll
|
||||
-EXTRA_DIST += test-strtoll.c signature.h macros.h
|
||||
-
|
||||
-## end gnulib module strtoll-tests
|
||||
-
|
||||
-## begin gnulib module strtoull-tests
|
||||
-
|
||||
-TESTS += test-strtoull
|
||||
-check_PROGRAMS += test-strtoull
|
||||
-EXTRA_DIST += test-strtoull.c signature.h macros.h
|
||||
-
|
||||
-## end gnulib module strtoull-tests
|
||||
-
|
||||
## begin gnulib module strtoumax-tests
|
||||
|
||||
TESTS += test-strtoumax
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 9b4422e..c460801 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -192,7 +192,6 @@ TESTS = \
|
||||
word-multi-file \
|
||||
word-multibyte \
|
||||
write-error-msg \
|
||||
- y2038-vs-32-bit \
|
||||
yesno \
|
||||
z-anchor-newline
|
||||
|
||||
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
||||
index 8ae7bb4..a6d6d97 100644
|
||||
--- a/tests/Makefile.in
|
||||
+++ b/tests/Makefile.in
|
||||
@@ -2077,7 +2077,6 @@ TESTS = \
|
||||
word-multi-file \
|
||||
word-multibyte \
|
||||
write-error-msg \
|
||||
- y2038-vs-32-bit \
|
||||
yesno \
|
||||
z-anchor-newline
|
||||
|
||||
@@ -3291,13 +3290,6 @@ write-error-msg.log: write-error-msg
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-y2038-vs-32-bit.log: y2038-vs-32-bit
|
||||
- @p='y2038-vs-32-bit'; \
|
||||
- b='y2038-vs-32-bit'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
yesno.log: yesno
|
||||
@p='yesno'; \
|
||||
b='yesno'; \
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 223088f..315ced7 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -195,7 +195,6 @@ TESTS = \
|
||||
word-delim-multibyte \
|
||||
word-multi-file \
|
||||
word-multibyte \
|
||||
- write-error-msg \
|
||||
y2038-vs-32-bit \
|
||||
yesno \
|
||||
z-anchor-newline
|
||||
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
||||
index 3270d30..33dcd8a 100644
|
||||
--- a/tests/Makefile.in
|
||||
+++ b/tests/Makefile.in
|
||||
@@ -2729,7 +2729,6 @@ TESTS = \
|
||||
word-delim-multibyte \
|
||||
word-multi-file \
|
||||
word-multibyte \
|
||||
- write-error-msg \
|
||||
y2038-vs-32-bit \
|
||||
yesno \
|
||||
z-anchor-newline
|
||||
@@ -3970,13 +3969,6 @@ word-multibyte.log: word-multibyte
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-write-error-msg.log: write-error-msg
|
||||
- @p='write-error-msg'; \
|
||||
- b='write-error-msg'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
y2038-vs-32-bit.log: y2038-vs-32-bit
|
||||
@p='y2038-vs-32-bit'; \
|
||||
b='y2038-vs-32-bit'; \
|
||||
26
grep.spec
26
grep.spec
|
|
@ -1,7 +1,7 @@
|
|||
Summary: Pattern matching utilities
|
||||
Name: grep
|
||||
Version: 3.12
|
||||
Release: 2%{?dist}
|
||||
Version: 3.11
|
||||
Release: 10%{?dist}
|
||||
License: GPL-3.0-or-later AND LGPL-3.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.3-no-invariants-or-later
|
||||
URL: https://www.gnu.org/software/grep/
|
||||
|
||||
|
|
@ -14,9 +14,9 @@ Source5: GREP_COLORS
|
|||
Source6: grepconf.sh
|
||||
|
||||
# upstream ticket 39445
|
||||
Patch: grep-3.5-help-align.patch
|
||||
# upstream ticket 77800
|
||||
Patch: grep-3.12-test-write-error-msg-drop.patch
|
||||
Patch0: grep-3.5-help-align.patch
|
||||
# upstream ticket 63965, maybe glibc bug, temporal drop of some gnulib tests and y2038 test, it shouldn't cause any harm
|
||||
Patch1: grep-3.11-tests-drop.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pcre2-devel
|
||||
|
|
@ -60,7 +60,14 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
|
|||
%global BUILD_FLAGS %{BUILD_FLAGS} -mlong-double-64
|
||||
%endif
|
||||
|
||||
%configure --without-included-regex --disable-silent-rules CFLAGS="%{BUILD_FLAGS}"
|
||||
# Temporarily switch to the included regex until glibc bug is fixed:
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=11053
|
||||
#%%configure --without-included-regex --disable-silent-rules \
|
||||
|
||||
# temporal for gnulib patch, remove with the patch
|
||||
autoreconf -fi
|
||||
%configure --disable-silent-rules \
|
||||
CPPFLAGS="-I%{_includedir}/pcre" CFLAGS="%{BUILD_FLAGS}"
|
||||
%make_build
|
||||
|
||||
%install
|
||||
|
|
@ -89,13 +96,6 @@ make check
|
|||
%{_libexecdir}/grepconf.sh
|
||||
|
||||
%changelog
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.12-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Apr 14 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 3.12-1
|
||||
- New version
|
||||
Resolves: rhbz#2358901
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.11-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (grep-3.12.tar.xz) = c54b4db5a8b9afe098c088decd94977746305284d716666a60bac82b4edc0fae4acf828970b5b6fc7d58ecd549f638e17e6958f33a71fedcc7d7415b9228b161
|
||||
SHA512 (grep-3.12.tar.xz.sig) = 333755fd9e5879436789a19e9593667d6fb96c2d1b876a1c391eb9cd75d10bb7fbc10215db9838280e6006790c818ef4583b1ae22318a833a5b69264ca15dbf1
|
||||
SHA512 (grep-3.11.tar.xz.sig) = 487aba063373ca0594c519991f19b2a6a33b3da0d74735c890f3828fd0880e7e6f64495d2c8f9efa5da53d1eb2d446609bab2399a4b89dcb4510a632e31ffb54
|
||||
SHA512 (grep-3.11.tar.xz) = f254a1905a08c8173e12fbdd4fd8baed9a200217fba9d7641f0d78e4e002c1f2a621152d67027d9b25f0bb2430898f5233dc70909d8464fd13d7dd9298e65c42
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue