forked from pool/aaa_base
Accepting request 964641 from Base:System
- Update to version 84.87+git20220324.fca4619: * No completion in restricted bash * No longer install /usr/lib/restricted/bin/hostname => /bin/hostname symlink - Update to version 84.87+git20220321.f60f2de: * order header in the way spec-cleaner wants it * move changes from package to git * merge audio files highlighting fixes from coreutils 9 * Update from coreutils 9 * Make source validator happy - Update to version 84.87+git20220321.5a5cb79: * DIR_COLORS: lz support * DIR_COLORS: zstd support - Update to version 84.87+git20220221.b62a2cf: * package: Require new enough version of glibc * package: build in place support * drop /etc/ttytype (boo#1191923) - Update to version 84.87+git20211206.de24bdf: * Add "rpm" make target * Remove legacy usrmerged sections * Add rpmlintrc and README from OBS too * Fix osc service instructions * Add obs workflow for git integration * Adopt upstream way of setting rp_filter and promote_secondaries * Don't fail if net.ipv4.ping_group_range can't be set * add spec file OBS-URL: https://build.opensuse.org/request/show/964641 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=486
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f74604d77b
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -22,4 +22,4 @@
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
## Specific LFS patterns
|
||||
aaa_base-84.87+git20211124.5486aad.tar filter=lfs diff=lfs merge=lfs -text
|
||||
aaa_base-84.87+git20220324.fca4619.tar filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
@ -1,15 +1,10 @@
|
||||
This package should use just the content of the git tree. If you need
|
||||
to make changes, you have the following options:
|
||||
* Make them in git and update the package from git (you can send merge
|
||||
request if you don't have write access)
|
||||
* Create a patch, add the patch to the package and let one of the
|
||||
aaa_base packagers commit it for you
|
||||
|
||||
The online repository is at:
|
||||
This package is maintained in git at
|
||||
http://github.com/openSUSE/aaa_base
|
||||
|
||||
For building the package from git run the service directly:
|
||||
osc service disabledrun
|
||||
Please file a pull request for any changes. The spec file is also in
|
||||
git.
|
||||
|
||||
Note that aaa_base.spec and aaa_base.changes are not part of the git
|
||||
repo.
|
||||
For building the package from git you have to adjust the _service
|
||||
file to point at the right branch, then call
|
||||
|
||||
osc service manualrun
|
||||
|
||||
3
_service
3
_service
@ -5,6 +5,9 @@
|
||||
<param name="url">https://github.com/openSUSE/aaa_base.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="extract">aaa_base.spec</param>
|
||||
<param name="extract">aaa_base-rpmlintrc</param>
|
||||
<param name="extract">README.packaging.txt</param>
|
||||
</service>
|
||||
<service name="set_version" mode="manual"/>
|
||||
</services>
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/openSUSE/aaa_base.git</param>
|
||||
<param name="changesrevision">5486aadee23a19422cc54064dc6c95ee47f87cf8</param></service></servicedata>
|
||||
<param name="changesrevision">fca461968130bbc1b8c5472603c81c90d0d8b9bd</param></service><service name="tar_scm">
|
||||
<param name="url">https://github.com/lnussel/aaa_base.git</param>
|
||||
<param name="changesrevision">0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3e5c1c65911a684de5217c15a6b66cf179eb43b19db3635df171a9c06b981aa0
|
||||
size 368640
|
||||
3
aaa_base-84.87+git20220324.fca4619.tar
Normal file
3
aaa_base-84.87+git20220324.fca4619.tar
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:89bc15a9e011e6b567ea7c456dd0a7d603f22109cb5d849508033a0b7792952d
|
||||
size 378880
|
||||
@ -1,3 +1,48 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 24 11:21:41 UTC 2022 - dmueller@suse.com
|
||||
|
||||
- Update to version 84.87+git20220324.fca4619:
|
||||
* No completion in restricted bash
|
||||
* No longer install /usr/lib/restricted/bin/hostname => /bin/hostname symlink
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 21 17:33:26 UTC 2022 - lnussel@suse.de
|
||||
|
||||
- Update to version 84.87+git20220321.f60f2de:
|
||||
* order header in the way spec-cleaner wants it
|
||||
* move changes from package to git
|
||||
* merge audio files highlighting fixes from coreutils 9
|
||||
* Update from coreutils 9
|
||||
* Make source validator happy
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 21 10:08:15 UTC 2022 - lnussel@suse.de
|
||||
|
||||
- Update to version 84.87+git20220321.5a5cb79:
|
||||
* DIR_COLORS: lz support
|
||||
* DIR_COLORS: zstd support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 21 09:18:44 UTC 2022 - lnussel@suse.de
|
||||
|
||||
- Update to version 84.87+git20220221.b62a2cf:
|
||||
* package: Require new enough version of glibc
|
||||
* package: build in place support
|
||||
* drop /etc/ttytype (boo#1191923)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 11 16:05:25 UTC 2021 - dleuenberger@suse.com
|
||||
|
||||
- Update to version 84.87+git20211206.de24bdf:
|
||||
* Add "rpm" make target
|
||||
* Remove legacy usrmerged sections
|
||||
* Add rpmlintrc and README from OBS too
|
||||
* Fix osc service instructions
|
||||
* Add obs workflow for git integration
|
||||
* Adopt upstream way of setting rp_filter and promote_secondaries
|
||||
* Don't fail if net.ipv4.ping_group_range can't be set
|
||||
* add spec file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 25 07:16:25 UTC 2021 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package aaa_base
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -22,13 +22,26 @@
|
||||
%define _fillupdir /var/adm/fillup-templates
|
||||
%endif
|
||||
|
||||
%if 0%{?_build_in_place}
|
||||
%define git_version %(git log '-n1' '--date=format:%Y%m%d' '--no-show-signature' "--pretty=format:+git%cd.%h")
|
||||
BuildRequires: git-core
|
||||
%else
|
||||
# this is required for obs' source validator. It's
|
||||
# 20-files-present-and-referenced ignores all conditionals. So the
|
||||
# definition of git_version actually happens always.
|
||||
%define git_version %{nil}
|
||||
%endif
|
||||
|
||||
Name: aaa_base
|
||||
Version: 84.87+git20211124.5486aad
|
||||
Version: 84.87+git20220324.fca4619%{git_version}
|
||||
Release: 0
|
||||
Summary: openSUSE Base Package
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Fhs
|
||||
URL: https://github.com/openSUSE/aaa_base
|
||||
# do not require systemd - aaa_base is in the build environment and we don't
|
||||
# want to pull in tons of dependencies
|
||||
Conflicts: sysvinit-init
|
||||
Source: aaa_base-%{version}.tar
|
||||
Source1: README.packaging.txt
|
||||
Source99: aaa_base-rpmlintrc
|
||||
Requires: /bin/mktemp
|
||||
Requires: /usr/bin/cat
|
||||
Requires: /usr/bin/date
|
||||
@ -39,28 +52,20 @@ Requires: /usr/bin/tput
|
||||
Requires: /usr/bin/xz
|
||||
Requires: distribution-release
|
||||
Requires: filesystem
|
||||
Requires(pre): /usr/bin/rm
|
||||
Requires(pre): (glibc >= 2.30 if glibc)
|
||||
Requires(post): fillup /usr/bin/chmod /usr/bin/chown
|
||||
Recommends: aaa_base-extras
|
||||
Recommends: iproute2
|
||||
Recommends: iputils
|
||||
Recommends: logrotate
|
||||
Recommends: netcfg
|
||||
Recommends: udev
|
||||
Requires(pre): /usr/bin/rm
|
||||
Requires(pre): glibc >= 2.30
|
||||
Requires(post): fillup /usr/bin/chmod /usr/bin/chown
|
||||
# do not require systemd - aaa_base is in the build environment and we don't
|
||||
# want to pull in tons of dependencies
|
||||
Conflicts: sysvinit-init
|
||||
|
||||
Summary: openSUSE Base Package
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Fhs
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# run osc service mr to recreate
|
||||
Source: aaa_base-%{version}.tar
|
||||
#
|
||||
# Read README.packaging.txt before making any changes to this
|
||||
# package
|
||||
#
|
||||
Source1: README.packaging.txt
|
||||
Source99: aaa_base-rpmlintrc
|
||||
|
||||
%description
|
||||
This package installs several important configuration files and central scripts.
|
||||
@ -101,27 +106,12 @@ systems.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
sed -i 's|actiondir="/usr/lib/initscripts/legacy-actions"|actiondir="%{_libexecdir}/initscripts/legacy-actions"|' \
|
||||
files/usr/sbin/service
|
||||
|
||||
%build
|
||||
make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}
|
||||
if test -d patches/$RPM_ARCH; then
|
||||
pushd files
|
||||
for file in ../patches/$RPM_ARCH/*; do
|
||||
patch -p0 --input=$file
|
||||
done
|
||||
find -name "*.orig" | xargs -r rm
|
||||
popd
|
||||
fi
|
||||
%make_build CFLAGS="%{optflags}" CC="%{__cc}"
|
||||
|
||||
%install
|
||||
#
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
%if 0%{?usrmerged}
|
||||
rm -f %{buildroot}/sbin/*
|
||||
%endif
|
||||
#
|
||||
%make_install
|
||||
mkdir -p %{buildroot}/etc/sysctl.d
|
||||
case "$RPM_ARCH" in
|
||||
s390*) ;;
|
||||
@ -129,11 +119,11 @@ case "$RPM_ARCH" in
|
||||
esac
|
||||
#
|
||||
# make sure it does not creep in again
|
||||
test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1
|
||||
test -d %{buildroot}/root/.gnupg && exit 1
|
||||
# TODO: get rid of that at some point in the future
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/init.d
|
||||
mkdir -p %{buildroot}/etc/init.d
|
||||
for i in boot.local after.local ; do
|
||||
install -m 755 /dev/null $RPM_BUILD_ROOT/etc/init.d/$i
|
||||
install -m 755 /dev/null %{buildroot}/etc/init.d/$i
|
||||
done
|
||||
#
|
||||
install -d -m 755 %buildroot%{_libexecdir}/initscripts/legacy-actions
|
||||
@ -177,7 +167,6 @@ mkdir -p %{buildroot}%{_fillupdir}
|
||||
%service_del_postun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license COPYING
|
||||
%config(noreplace) /etc/sysctl.conf
|
||||
%config /etc/bash.bashrc
|
||||
@ -203,7 +192,6 @@ mkdir -p %{buildroot}%{_fillupdir}
|
||||
/usr/etc/profile.d/ls.bash
|
||||
/usr/etc/profile.d/ls.zsh
|
||||
%config /etc/shells
|
||||
%config /etc/ttytype
|
||||
%ghost %dir /etc/init.d
|
||||
%ghost %config(noreplace) /etc/init.d/boot.local
|
||||
%ghost %config(noreplace) /etc/init.d/after.local
|
||||
@ -220,7 +208,6 @@ mkdir -p %{buildroot}%{_fillupdir}
|
||||
/usr/bin/rpmlocate
|
||||
/usr/bin/safe-rm
|
||||
/usr/bin/safe-rmdir
|
||||
/usr/lib/restricted/bin/hostname
|
||||
/usr/sbin/sysconf_addword
|
||||
/usr/share/man/man1/smart_agetty.1*
|
||||
/usr/share/man/man5/defaultdomain.5*
|
||||
@ -233,14 +220,8 @@ mkdir -p %{buildroot}%{_fillupdir}
|
||||
%{_fillupdir}/sysconfig.language
|
||||
%{_fillupdir}/sysconfig.proxy
|
||||
%{_fillupdir}/sysconfig.windowmanager
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/service
|
||||
/sbin/refresh_initrd
|
||||
/sbin/smart_agetty
|
||||
%endif
|
||||
|
||||
%files extras
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) /etc/DIR_COLORS
|
||||
/etc/skel/.emacs
|
||||
/etc/skel/.inputrc
|
||||
@ -255,12 +236,10 @@ mkdir -p %{buildroot}%{_fillupdir}
|
||||
%{_fillupdir}/sysconfig.backup
|
||||
|
||||
%files malloccheck
|
||||
%defattr(-,root,root)
|
||||
/usr/etc/profile.d/malloc-debug.sh
|
||||
/usr/etc/profile.d/malloc-debug.csh
|
||||
|
||||
%files wsl
|
||||
%defattr(-,root,root)
|
||||
/usr/etc/profile.d/wsl.csh
|
||||
/usr/etc/profile.d/wsl.sh
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user