Compare commits
6 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 4cceebb4ee | |||
| 6642bd0dbd | |||
| 4537868d26 | |||
| 81b11cc2f1 | |||
| 1e4e0599df | |||
| ae707279c6 |
5
_service
5
_service
@@ -1,15 +1,18 @@
|
||||
<services>
|
||||
<service mode="disabled" name="tar_scm">
|
||||
<!-- <service name="tar_scm"> -->
|
||||
<param name="url">git://git.savannah.gnu.org/gnulib.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="filename">gnulib</param>
|
||||
<param name="versionformat">git.%cd.%h</param>
|
||||
<param name="revision">db493d1ce43fc39dd925699d840c80b3400f4313</param>
|
||||
<param name="revision">stable-202401</param>
|
||||
</service>
|
||||
<service mode="disabled" name="recompress">
|
||||
<!-- <service name="recompress"> -->
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service mode="disabled" name="set_version"/>
|
||||
<!-- <service name="set_version"/> -->
|
||||
</services>
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f91267dcd962ba16b1d32f9bea2dcd788400f81ea953acbb48590cd363be1cc
|
||||
size 4598580
|
||||
3
gnulib-git.20260114.2a288c048e.tar.xz
Normal file
3
gnulib-git.20260114.2a288c048e.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:47ebb015a1fe0f69c79bd4dc398889121e0054247e8caa5f3e2a6356e163c505
|
||||
size 5760776
|
||||
@@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 5 11:21:13 UTC 2026 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Remove nomemset_expicit.patch as not needed anymore
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 27 08:15:31 UTC 2026 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Update to gnulib-stable-202601 which is based on 2a288c0
|
||||
Detailed commit changelog at https://github.com/coreutils/gnulib/commits/stable-202601/
|
||||
- Avoid dummys means add libacl, libattr, libncurses development
|
||||
- Drop --avoid=havelib as otherwise no autopoint from gettext
|
||||
will be executed which leads to not expanded m4 macros
|
||||
- Add patch nomemset_expicit.patch
|
||||
* Work around currently missing memset_explicit in (g)libc
|
||||
(why there is a declaration in string.h and string_fortified.h?)
|
||||
- Drop git-merge-changelog as this binary had been removed
|
||||
- Split build of info and html as otherwise parallel jobs
|
||||
obstruct each other
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 11 10:21:20 UTC 2024 - opensuse.lietuviu.kalba@gmail.com
|
||||
|
||||
- Update to the latest version git.20240213.c99c8d4918 from
|
||||
stable-202401 branch. See detailed changelog here:
|
||||
https://git.savannah.gnu.org/gitweb/?p=gnulib.git;f=ChangeLog;hb=refs/heads/stable-202401
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 8 15:10:47 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
60
gnulib.spec
60
gnulib.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gnulib
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -19,7 +19,7 @@
|
||||
%global module1 git-merge-changelog
|
||||
|
||||
Name: gnulib
|
||||
Version: git.20211127.db493d1ce
|
||||
Version: git.20260114.2a288c048e
|
||||
Release: 0
|
||||
Summary: GNU Portability Library
|
||||
License: GPL-2.0-or-later AND SUSE-Public-Domain 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
|
||||
@@ -28,13 +28,18 @@ URL: http://www.gnu.org/software/gnulib
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
Source1: http://erislabs.net/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=debian/manpages/check-module.1
|
||||
Source2: http://erislabs.net/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=debian/manpages/gnulib-tool.1
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
# For building Modules, all gnulib requires must be found, Modules BRs:
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: gperf
|
||||
BuildRequires: help2man
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: texinfo
|
||||
|
||||
%description
|
||||
@@ -57,6 +62,8 @@ Requires: patch
|
||||
Requires: texinfo
|
||||
Provides: gnulib
|
||||
BuildArch: noarch
|
||||
%define add_optflags(a:f:t:p:w:W:d:g:O:A:C:D:E:H:i:M:n:P:U:u:l:s:X:B:I:L:b:V:m:x:c:S:E:o:v:) \
|
||||
%global optflags %{optflags} %{**}
|
||||
|
||||
%description devel
|
||||
The GNU portability library is a macro system and C declarations and
|
||||
@@ -71,7 +78,7 @@ License: GFDL-1.3-only
|
||||
Group: Development/Languages/C and C++
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
Requires(post): info
|
||||
Requires(preun):info
|
||||
Requires(preun): info
|
||||
BuildArch: noarch
|
||||
|
||||
%description docs
|
||||
@@ -81,35 +88,31 @@ It can be used to improve portability and other functionality in your programs.
|
||||
|
||||
This package contains documentation for %{name}.
|
||||
|
||||
%package -n git-merge-changelog
|
||||
Summary: Git merge driver for ChangeLog files
|
||||
License: GPL-2.0-or-later
|
||||
Group: Development/Languages/C and C++
|
||||
|
||||
%description -n git-merge-changelog
|
||||
Git Merge Changelog is a git merge driver for changelogs that combines
|
||||
parallel additions to the changelog without generating merge conflicts.
|
||||
It can be enabled for specific files by setting appropriate git attributes.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n gnulib-stable-202601
|
||||
LC_ALL=C.UTF-8
|
||||
LANG=C.UTF-8
|
||||
export LC_ALL LANG
|
||||
%add_optflags -D_DEFAULT_SOURCE
|
||||
|
||||
#modules not to be tested by direct import
|
||||
toRemove="lib-symbol-visibility havelib .*-obsolete localcharset gettext-h gettext alloca-opt alloca "
|
||||
toRemove="$(echo $toRemove | tr ' ' '|')"
|
||||
|
||||
list="$(./gnulib-tool --list | grep -vE "($toRemove)")"
|
||||
unset toRemove
|
||||
|
||||
list="$(./gnulib-tool --list)"
|
||||
for item in $toRemove
|
||||
do
|
||||
list="$(echo $list| sed "s:\b$item\b::g")"
|
||||
done
|
||||
#is necessary to avoid some modules to test prep pass
|
||||
./gnulib-tool --create-testdir --with-tests --with-obsolete --avoid=alloca --avoid=lib-symbol-visibility --avoid=havelib --dir=build-tests $list
|
||||
./gnulib-tool --create-testdir --with-tests --with-obsolete --avoid=alloca --avoid=lib-symbol-visibility --dir=build-tests $list
|
||||
|
||||
rm lib/javaversion.class
|
||||
# MODULE #1 - git-merge-changelog
|
||||
./gnulib-tool --create-testdir --dir=build-git-merge-changelog git-merge-changelog
|
||||
|
||||
%build
|
||||
LC_ALL=C.UTF-8
|
||||
LANG=C.UTF-8
|
||||
export LC_ALL LANG
|
||||
# MODULE #1 - git-merge-changelog
|
||||
pushd build-git-merge-changelog
|
||||
%configure --prefix=%{_prefix}
|
||||
@@ -128,7 +131,8 @@ make %{?_smp_mflags} MODULES.html
|
||||
sed -i -r 's#HREF="(lib|m4|modules)#HREF="%{_datadir}/%{name}/\1#g' MODULES.html
|
||||
sed -i "/^[ ]*gnulib_dir=/s#\`[^\`]*\`#%{_datadir}/%{name}#" gnulib-tool
|
||||
# This part is done with the target path
|
||||
make %{?_smp_mflags} info html
|
||||
make %{?_smp_mflags} info
|
||||
make %{?_smp_mflags} html
|
||||
# Removing unused files
|
||||
rm -f */.cvsignore
|
||||
rm -f */.gitignore
|
||||
@@ -137,6 +141,9 @@ rm -f lib/.cppi-disable
|
||||
rm -f lib/uniname/gen-uninames.lisp
|
||||
|
||||
%check
|
||||
LC_ALL=C.UTF-8
|
||||
LANG=C.UTF-8
|
||||
export LC_ALL LANG
|
||||
pushd build-tests
|
||||
make %{?_smp_mflags} check
|
||||
popd
|
||||
@@ -155,6 +162,8 @@ cp -rp build-aux lib m4 modules config tests %{buildroot}%{_datadir}/%{name}/
|
||||
# relocatable.texi is needed during compilation of PSPP. See rh#1474792 and
|
||||
# https://src.fedoraproject.org/rpms/gnulib/c/cea2f6f12fe24479e282900341575352689d7cfe?branch=master
|
||||
cp -p doc/relocatable.texi %{buildroot}%{_datadir}/%{name}/doc
|
||||
# Needed for jitter
|
||||
cp -p doc/{gendocs_template,gendocs_template_min,INSTALL} %{buildroot}%{_datadir}/%{name}/doc
|
||||
|
||||
cp -p doc/gnulib.info %{buildroot}%{_infodir}/
|
||||
cp -p doc/gnulib.html MODULES.html NEWS COPYING ChangeLog users.txt doc/COPYING* %{buildroot}%{_docdir}/%{name}/
|
||||
@@ -164,7 +173,6 @@ cp -p %{SOURCE1} %{SOURCE2} %{buildroot}%{_mandir}/man1
|
||||
pushd build-git-merge-changelog
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
popd
|
||||
help2man -N --no-discard-stderr %{buildroot}%{_bindir}/git-merge-changelog | gzip -9c > %{buildroot}%{_mandir}/man1/git-merge-changelog.1.gz
|
||||
|
||||
%post docs
|
||||
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
@@ -176,7 +184,7 @@ fi
|
||||
|
||||
%files docs
|
||||
%defattr(-,root,root)
|
||||
%{_infodir}/gnulib.info.gz
|
||||
%{_infodir}/gnulib.info*
|
||||
%{_docdir}/%{name}/gnulib.html
|
||||
%{_docdir}/%{name}/MODULES.html
|
||||
# license text is included directly in info and html files.
|
||||
@@ -192,10 +200,4 @@ fi
|
||||
%exclude %{_docdir}/%{name}/MODULES.html
|
||||
%exclude %{_docdir}/%{name}/gnulib.html
|
||||
|
||||
%files -n git-merge-changelog
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/git-merge-changelog
|
||||
%{_mandir}/*/git-merge-changelog.*
|
||||
%doc doc/COPYINGv2
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user