diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..0caffcb929fc352c50318220d90bf725666b9d50 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/gnulib diff --git a/gnulib-bad1faa.tar.gz b/gnulib-bad1faa.tar.gz index 72264543494623aa8f05fff29a53f074f1b4c012..c81ea73b7d47df31b7f43643f107c3a0092241c2 100644 Binary files a/gnulib-bad1faa.tar.gz and b/gnulib-bad1faa.tar.gz differ diff --git a/gnulib-gettext-0.24.1.patch b/gnulib-gettext-0.24.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..269d6787e9cd1c81e850261703271d370c061c17 --- /dev/null +++ b/gnulib-gettext-0.24.1.patch @@ -0,0 +1,31 @@ +diff --git gnulib-bad1faa/gnulib-tool gnulib-bad1faa/gnulib-tool +index 13e3ff2..1c1db17 100644 +--- gnulib-bad1faa/gnulib-tool ++++ gnulib-bad1faa/gnulib-tool +@@ -6790,7 +6790,7 @@ func_create_testdir () + echo + echo "SUBDIRS = $subdirs" + echo +- echo "ACLOCAL_AMFLAGS = -I $m4base" ++ echo "ACLOCAL_AMFLAGS = -I $m4base -I /usr/share/gettext/m4" + ) > "$testdir/Makefile.am" + + # Create configure.ac. +@@ -6939,7 +6939,7 @@ + if test "$libtool" = true; then + func_execute_command ${LIBTOOLIZE} --copy || func_exit 1 + fi +- func_execute_command ${ACLOCAL} -I $m4base || func_exit 1 ++ func_execute_command ${ACLOCAL} -I $m4base -I /usr/share/gettext/m4 || func_exit 1 + if ! test -d build-aux; then + func_execute_command mkdir build-aux || func_exit 1 + fi +@@ -6964,7 +6964,7 @@ + fi + done + fi +- func_execute_command ${ACLOCAL} -I ../$m4base || func_exit 1 ++ func_execute_command ${ACLOCAL} -I ../$m4base -I /usr/share/gettext/m4 || func_exit 1 + if ! test -d ../build-aux; then + func_execute_command mkdir ../build-aux + fi diff --git a/gnulib.spec b/gnulib.spec index e74a4cdd6039b3584f9a5421ef3c2fd67f312cb4..e73c4e0a7ae993adf272e9d97ed3c2e8484e41be 100644 --- a/gnulib.spec +++ b/gnulib.spec @@ -3,7 +3,7 @@ %global gitdate 20230709 Name: gnulib Version: 0 -Release: 48.%{gitdate}git +Release: 49.%{gitdate}git Summary: The GNU Portability Library License: Public Domain and BSD-3-Clause and GPL-2.0-or-later and GPL-3.0-only and GPL-3.0-or-later and LGPL-2.0-only and LGPL-2.1-or-later and LGPL-3.0-or-later URL: https://www.gnu.org/software/gnulib @@ -12,6 +12,7 @@ Source1: https://erislabs.net/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD Source2: https://erislabs.net/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=debian/manpages/gnulib-tool.1 Patch0: test-u8-strstr-alarm.diff +Patch1: gnulib-gettext-0.24.1.patch BuildRequires: perl-generators texinfo gettext-devel bison gperf libtool help2man git make ncurses-devel BuildRequires: gcc_secure java-11-openjdk-devel @@ -32,8 +33,6 @@ This package contains development files for gnulib. %package help Summary: Provides documentation for gnulib modules License: GFDL-1.1-or-later and GPL-2.0-or-later -Requires(post): info -Requires(preun): info Requires: gnulib-devel = %{version}-%{release} Provides: gnulib-docs = %{version}-%{release} Obsoletes: gnulib-docs < %{version}-%{release} @@ -86,7 +85,7 @@ make -C build-tests check VERBOSE=1 %install install -d %{buildroot}%{_datadir}/gnulib install -d %{buildroot}%{_bindir} -install -d %{buildroot}%{_datadir}/info +install -d %{buildroot}%{_infodir} install -d %{buildroot}%{_docdir}/gnulib install -d %{buildroot}%{_mandir}/man1 @@ -100,14 +99,7 @@ cp -p doc/gnulib.info %{buildroot}%{_datadir}/info/ cp -p doc/gnulib.html MODULES.html NEWS COPYING ChangeLog users.txt doc/COPYING* %{buildroot}%{_docdir}/gnulib/ %make_install -C build-gnulib-root -help2man -N --no-discard-stderr %{buildroot}%{_bindir}/git-merge-changelog | gzip -9c > %{buildroot}%{_mandir}/man1/git-merge-changelog.1.gz - -%post help -/sbin/install-info %{_infodir}/gnulib.info %{_infodir}/dir || : -%preun help -if [ $1 = 0 ] ; then - /sbin/install-info --delete %{_infodir}/gnulib.info %{_infodir}/dir || : -fi +help2man -N --no-discard-stderr %{buildroot}%{_bindir}/git-merge-changelog > %{buildroot}%{_mandir}/man1/git-merge-changelog.1 %files devel %{_datadir}/gnulib/ @@ -118,7 +110,7 @@ fi %exclude %{_docdir}/gnulib/gnulib.html %files help -%{_datadir}/info/gnulib.info.gz +%{_infodir}/gnulib.info* %{_docdir}/gnulib/gnulib.html %{_docdir}/gnulib/MODULES.html %{_mandir}/*/git-merge-changelog.* @@ -126,6 +118,9 @@ fi %license doc/COPYINGv2 %changelog +* Wed Jun 11 2025 Funda Wang - 0-49.20230709git +- fix build with gettext 0.24.1 + * Thu Jul 18 2024 yaoxin - 0-48.20230709git - License compliance rectification