OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Feb-2004 15:02:59
Branch: OPENPKG_2_0_SOLID Handle: 2004022314025800
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/openpkg HISTORY openpkg.spec
Log:
MFC: warning changed and beecrypt changes
Summary:
Revision Changes Path
1.142.2.2 +2 -0 openpkg-src/openpkg/HISTORY
1.295.2.6 +32 -24 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.142.2.1 -r1.142.2.2 HISTORY
--- openpkg-src/openpkg/HISTORY 21 Feb 2004 19:15:23 -0000 1.142.2.1
+++ openpkg-src/openpkg/HISTORY 23 Feb 2004 14:02:58 -0000 1.142.2.2
@@ -2,6 +2,8 @@
2004
====
+20040223 change BeeCrypt building to use no assembly code at all
+20040223 use a more smart rpm/rpm2cpio execution wrapper warning
20040221 written manual page for "openpkg uuid"
20040221 implemented "openpkg man" command for reading tool chain command manual
pages
20040220 fix "openpkg rpm-config --version" output
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.295.2.5 -r1.295.2.6 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 21 Feb 2004 19:20:52 -0000 1.295.2.5
+++ openpkg-src/openpkg/openpkg.spec 23 Feb 2004 14:02:58 -0000 1.295.2.6
@@ -626,22 +626,14 @@
# build BeeCrypt library
( cd beecrypt-%{V_beecrypt}
- opts=""
- shtool="`SOURCE shtool`"
- platform="`sh $shtool platform -n -L -S '' -C '+' -F '%<ap>-%<sp>'`"
- case "$platform" in
- ix86-freebsd[45]* ) ;;
- ix86-debian3.0 | ix86-redhat9 | ix86-suse8* ) ;;
- sparc64-solaris[89] ) ;;
- * ) opts="--with-cpu=none --with-arch=none" ;;
- esac
CC="${l_cc}" \
CFLAGS="-O" \
./configure \
--prefix=%{l_prefix} \
--disable-threads \
--disable-shared \
- $opts
+ --with-cpu=none \
+ --with-arch=none
${l_make} || exit $?
cp .libs/libbeecrypt.a .
) || exit $?
@@ -877,26 +869,42 @@
$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm2cpio
mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/rpm2cpio.8 \
$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm2cpio.8
- ( echo "#!/bin/sh"
- echo "echo \"openpkg:WARNING: The \\\"%{l_prefix}/bin/rpm2cpio\\\" command is
deprecated since OpenPKG 2.0!\" 1>&2"
- echo "echo \"openpkg:WARNING: It will be finally removed in OpenPKG 2.1, so
please start using the\" 1>&2"
- echo "echo \"openpkg:WARNING: \\\"%{l_prefix}/bin/openpkg rpm2cpio\\\"
command instead, please. Thanks.\" 1>&2"
- echo "exec %{l_prefix}/bin/openpkg rpm2cpio \${1+\"[EMAIL PROTECTED]"}"
- ) >$RPM_BUILD_ROOT%{l_prefix}/bin/rpm2cpio
- chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/rpm2cpio
# move rpm tool to custom location
mv $RPM_BUILD_ROOT%{l_prefix}/bin/rpm \
$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm
- ( echo "#!/bin/sh"
- echo "echo \"openpkg:WARNING: The \\\"%{l_prefix}/bin/rpm\\\" command is
deprecated since OpenPKG 2.0!\" 1>&2"
- echo "echo \"openpkg:WARNING: It will be finally removed in OpenPKG 2.1, so
already start using the\" 1>&2"
- echo "echo \"openpkg:WARNING: \\\"%{l_prefix}/bin/openpkg rpm\\\" command
instead, please. Thanks.\" 1>&2"
- echo "exec %{l_prefix}/bin/openpkg rpm \${1+\"[EMAIL PROTECTED]"}"
- ) >$RPM_BUILD_ROOT%{l_prefix}/bin/rpm
- chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/rpm
mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/rpm.8 \
$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm.8
+
+ # install backward compatibility wrappers
+ for cmd in rpm rpm2cpio; do
+ ( echo "#!/bin/sh"
+ echo 'warn=yes'
+ echo 'if [ ".$HOME" != . ]; then'
+ echo ' if [ ! -d $HOME/.openpkg ]; then'
+ echo ' (umask 022; mkdir $HOME/.openpkg >/dev/null 2>&1 || true)'
+ echo ' fi'
+ echo ' if [ -d $HOME/.openpkg ]; then'
+ echo " if [ -f \$HOME/.openpkg/timestamp ] && \\"
+ echo ' [ ".`find $HOME/.openpkg -name timestamp -mtime -1
-print`" != . ]; then'
+ echo ' warn=no'
+ echo ' else'
+ echo ' date >$HOME/.openpkg/timestamp 2>/dev/null || true'
+ echo ' fi'
+ echo ' fi'
+ echo 'fi'
+ echo 'if [ ".$warn" = .yes ]; then'
+ echo " ( echo \"The \\\"%{l_prefix}/bin/$cmd\\\" command is deprecated
since OpenPKG 2.0\""
+ echo " echo \"because of namespace and integration reasons. The
command will be finally\""
+ echo " echo \"removed in OpenPKG 2.1, so please start using the new
canonical command\""
+ echo " echo \"\\\"%{l_prefix}/bin/openpkg $cmd\\\" instead.
Thanks.\""
+ echo " ) | %{l_prefix}/lib/openpkg/rpmtool msg -b -t warn"
+ echo ' sleep 8'
+ echo 'fi'
+ echo "exec %{l_prefix}/bin/openpkg $cmd \${1+\"[EMAIL PROTECTED]"}"
+ ) >$RPM_BUILD_ROOT%{l_prefix}/bin/$cmd
+ chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/$cmd
+ done
# install RPM extension
( cd rpm-%{V_rpm}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
