From 872fa637274fc188194366a509d45fc6a0acb82960ed45403735894f9f6fad93 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Tue, 13 Aug 2019 23:09:54 +0000 Subject: [PATCH] back to normal OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=657 --- _service | 6 +- ...:aaa_base-84.87+git20190718.ce933cb.tar.xz | 3 - _service:set_version:aaa_base.spec | 255 ------------------ _service:tar_scm:_servicedata | 4 - 4 files changed, 3 insertions(+), 265 deletions(-) delete mode 100644 _service:recompress:tar_scm:aaa_base-84.87+git20190718.ce933cb.tar.xz delete mode 100644 _service:set_version:aaa_base.spec delete mode 100644 _service:tar_scm:_servicedata diff --git a/_service b/_service index a0a72af..cfbb2ee 100644 --- a/_service +++ b/_service @@ -1,14 +1,14 @@ - + 84.87 84.87+git%cd.%h https://github.com/openSUSE/aaa_base.git git enable - + xz *.tar - + diff --git a/_service:recompress:tar_scm:aaa_base-84.87+git20190718.ce933cb.tar.xz b/_service:recompress:tar_scm:aaa_base-84.87+git20190718.ce933cb.tar.xz deleted file mode 100644 index e776a6a..0000000 --- a/_service:recompress:tar_scm:aaa_base-84.87+git20190718.ce933cb.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7eec973296ceb5a068e9303c67b165f05facd3b77044b9d2eca0f7ad0451112 -size 69376 diff --git a/_service:set_version:aaa_base.spec b/_service:set_version:aaa_base.spec deleted file mode 100644 index 8ce7285..0000000 --- a/_service:set_version:aaa_base.spec +++ /dev/null @@ -1,255 +0,0 @@ -# -# spec file for package aaa_base -# -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# -# icecream 0 - - -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif - -Name: aaa_base -Version: 84.87+git20190718.ce933cb -Release: 0 -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 -Requires: /bin/mktemp -Requires: /usr/bin/find -Requires: /usr/bin/tput -Requires: /usr/bin/xargs -Requires: cpio -Requires: distribution-release -Requires: filesystem -Recommends: logrotate netcfg udev iputils iproute2 aaa_base-extras -PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date -Requires(post): fillup -Summary: openSUSE Base Package -License: GPL-2.0-or-later -Group: System/Fhs -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# run osc service dr to recreate -Source: aaa_base-%{version}.tar.xz -# -# 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. - -%package extras -Summary: SUSE Linux Base Package (recommended part) -Group: System/Fhs -Requires: %{name} = %{version} -Requires(post): fillup -Provides: aaa_base:/etc/DIR_COLORS - -%description extras -The parts of aaa_base that should be installed by default but are not -strictly required to run a system. (Shell aliases, bash completions -and convenience hacks). - -%package malloccheck -Summary: SUSE Linux Base Package (malloc checking) -Group: System/Fhs -Requires: %{name} = %{version} - -%description malloccheck -This package sets environment variables that enable stricter -malloc checks to catch potential heap corruptions. It's not -installed by default as it may degrade performance. - -%package wsl -Summary: SUSE Linux Base Package (Windows Subsystem for Linux) -Group: System/Fhs -Requires: %{name} = %{version} - -%description wsl -This package includes some special settings needed on Windows Subsystem -for Linux. It should only be installed on WSL and not on regular Linux -systems. - -%prep -%setup -q - -%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 - -%install -# -make DESTDIR=$RPM_BUILD_ROOT install -# -mkdir -p %{buildroot}/etc/sysctl.d -case "$RPM_ARCH" in - s390*) ;; - *) rm -f %{buildroot}/usr/lib/sysctl.d/50-default-s390.conf ;; -esac -# -# make sure it does not creep in again -test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1 -mkdir -p $RPM_BUILD_ROOT/etc/init.d -for i in boot.local after.local halt.local ; do - echo "#!bin/bash" > $RPM_BUILD_ROOT/etc/init.d/$i - chmod 755 $RPM_BUILD_ROOT/etc/init.d/$i -done -# -install -d -m 755 %buildroot/usr/lib/initscripts/legacy-actions -# keep as ghost for migration -touch %buildroot/etc/inittab - -# Backup directories -install -d -m 755 %{buildroot}/var/adm/backup/{rpmdb,sysconfig} - -mkdir -p %{buildroot}%{_fillupdir} -%if "%{_fillupdir}" != "/var/adm/fillup-templates" - for f in %{buildroot}/var/adm/fillup-templates/* ; do - test -e "$f" || continue - mv $f %{buildroot}%{_fillupdir}/ - done - rm -vrf %{buildroot}/var/adm/fillup-templates -%endif -%if "%{_fillupdir}" != "/usr/share/fillup-templates" - for f in %{buildroot}/usr/share/fillup-templates/* ; do - test -e "$f" || continue - mv $f %{buildroot}%{_fillupdir}/ - done - rm -vrf %{buildroot}/usr/share/fillup-templates -%endif - -%pre -f aaa_base.pre - -%post -f aaa_base.post - -%pre extras -%service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer - -%post extras -%fillup_only -n backup -%service_add_post backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer - -%preun extras -%service_del_preun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer - -%postun extras -%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 -%config /etc/csh.cshrc -%config /etc/csh.login -%config /etc/inputrc -%config /etc/inputrc.keys -%config /etc/mime.types -%config /etc/profile -%config /etc/profile.d/alljava.csh -%config /etc/profile.d/alljava.sh -%config /etc/profile.d/csh.ssh -%config /etc/profile.d/lang.csh -%config /etc/profile.d/lang.sh -%config /etc/profile.d/profile.csh -%config /etc/profile.d/profile.sh -%config /etc/profile.d/sh.ssh -%config /etc/profile.d/xdg-environment.csh -%config /etc/profile.d/xdg-environment.sh -%config /etc/shells -%config /etc/ttytype -%ghost /etc/init.d/boot.local -%ghost /etc/init.d/after.local -%ghost /etc/init.d/halt.local -%ghost %config /etc/inittab -# don't forget to also change aaa_base.post, boot.cleanup -# and /etc/permissions! -%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog -/etc/hushlogins -/usr/bin/chkconfig -/sbin/chkconfig -/usr/bin/get_kernel_version -/sbin/refresh_initrd -/usr/sbin/refresh_initrd -/sbin/service -/usr/sbin/service -/sbin/smart_agetty -/usr/sbin/smart_agetty -/usr/bin/filesize -/usr/bin/mkinfodir -/usr/bin/old -/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* -/usr/share/man/man8/chkconfig.8* -/usr/share/man/man8/safe-rm.8* -/usr/share/man/man8/safe-rmdir.8* -/usr/share/man/man8/service.8* -/usr/lib/sysctl.d/*.conf -%dir /usr/lib/initscripts -%dir /usr/lib/initscripts/legacy-actions -%{_fillupdir}/sysconfig.language -%{_fillupdir}/sysconfig.proxy -%{_fillupdir}/sysconfig.windowmanager - -%files extras -%defattr(-,root,root) -%config(noreplace) /etc/DIR_COLORS -/etc/skel/.emacs -/etc/skel/.inputrc -%config /etc/profile.d/complete.bash -%config /etc/profile.d/alias.ash -/etc/profile.d/alias.bash -/etc/profile.d/alias.tcsh -/etc/profile.d/ls.tcsh -/etc/profile.d/ls.bash -/etc/profile.d/ls.zsh -%dir /usr/lib/base-scripts -/usr/lib/base-scripts/backup-rpmdb -/usr/lib/base-scripts/backup-sysconfig -/usr/lib/base-scripts/check-battery -/usr/lib/systemd/system/* -/usr/share/man/man8/resolv+.8* -/var/adm/backup/rpmdb -/var/adm/backup/sysconfig -%{_fillupdir}/sysconfig.backup - -%files malloccheck -%defattr(-,root,root) -%config /etc/profile.d/malloc-debug.sh -%config /etc/profile.d/malloc-debug.csh - -%files wsl -%defattr(-,root,root) -%config /etc/profile.d/wsl.csh -%config /etc/profile.d/wsl.sh - -%changelog diff --git a/_service:tar_scm:_servicedata b/_service:tar_scm:_servicedata deleted file mode 100644 index af43172..0000000 --- a/_service:tar_scm:_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://github.com/openSUSE/aaa_base.git - 8640f848c6677f1149b9765a8c86135956604007 \ No newline at end of file