SHA256
3
0
forked from pool/aaa_base
OBS User unknown 2007-03-20 23:36:09 +00:00 committed by Git OBS Bridge
parent cc979bff41
commit 1e2ba12ae9
3 changed files with 11 additions and 28 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 19 17:03:42 CET 2007 - rguenther@suse.de
- Do not require suse-build-key.
- Do not mess with roots keychain.
-------------------------------------------------------------------
Tue Mar 13 12:00:09 CET 2007 - werner@suse.de

View File

@ -308,20 +308,6 @@ fi
if test -L usr/i486-linux-libc6/lib/libqimgio.so ; then
rm -f usr/i486-linux-libc6/lib/libqimgio.so
fi
### import suse package build key to gpg keyring
if test -f root/.gnupg/pubring.gpg ; then
if test -x usr/bin/gpg -a -f usr/lib/libgdbm.so.2 ; then
chroot . usr/bin/gpg --export --armor --no-default-keyring \
--keyring root/.gnupg/suse_build_key build@suse.de \
| chroot . usr/bin/gpg --import || true
if ! chroot . usr/bin/gpg --list-keys build@suse.de >/dev/null 2>&1 ; then
echo "gpg import for build@suse.de failed, please import manually" >&2
fi
fi
else
cp root/.gnupg/suse_build_key root/.gnupg/pubring.gpg
fi
chmod 600 root/.gnupg/suse_build_key root/.gnupg/pubring.gpg
# change all /media mounts (subfs) to noauto
if test -f /etc/fstab ; then

View File

@ -11,7 +11,7 @@
# norootforbuild
Name: aaa_base
BuildRequires: aaa_skel suse-build-key
BuildRequires: aaa_skel
License: GNU General Public License (GPL)
Group: System/Fhs
Provides: bin bootutls etc skeleng skelger
@ -19,7 +19,7 @@ Requires: aaa_skel filesystem distribution-release logrotate /bin/mktemp /
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools
Autoreqprov: on
Version: 10.3
Release: 17
Release: 18
Summary: SUSE Linux Base Package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: aaa_base.tar.bz2
@ -59,18 +59,6 @@ gcc $RPM_OPT_FLAGS $RPM_SOURCE_DIR/get_kernel_version.c -o $RPM_SOURCE_DIR/get_k
%install
install -d -m 700 root
install -d -m 700 root/.gnupg
install -d -m 700 $HOME/.gnupg
HOME=$PWD/root gpg --no-default-keyring \
--keyring=/usr/lib/rpm/gnupg/pubring.gpg \
--export --armor build@suse.de \
| gpg --no-default-keyring --keyring=$PWD/root/.gnupg/suse_build_key \
--import
mv root/.gnupg root/.gnupg2
install -d -m 700 root/.gnupg
cp -a root/.gnupg2/suse_build_key root/.gnupg
rm -rf $PWD/root/.gnupg2
chmod 600 root/.gnupg/*
cp -a ../aaa_base/* $RPM_BUILD_ROOT
cp $RPM_SOURCE_DIR/get_kernel_version $RPM_BUILD_ROOT/sbin
# Copy .exrc and .xinitrc from /etc/skel for root
@ -143,6 +131,9 @@ done > aaa_base.files
%defattr(-,root,root)
%changelog
* Mon Mar 19 2007 - rguenther@suse.de
- Do not require suse-build-key.
- Do not mess with roots keychain.
* Tue Mar 13 2007 - werner@suse.de
- Fix of the fix for bugzilla #244788: be sure that the ~/.bashrc
is sourced once, not more not less.