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: 05-Apr-2004 22:01:02
Branch: OPENPKG_2_0_SOLID Handle: 2004040521010100
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/openpkg HISTORY install.sh man.sh openpkg.spec rpmmacros
Log:
MFC: all recent changes
Summary:
Revision Changes Path
1.142.2.4 +9 -0 openpkg-src/openpkg/HISTORY
1.1.2.1 +11 -7 openpkg-src/openpkg/install.sh
1.1.2.2 +5 -2 openpkg-src/openpkg/man.sh
1.295.2.9 +3 -3 openpkg-src/openpkg/openpkg.spec
1.59.2.1 +1 -1 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.142.2.3 -r1.142.2.4 HISTORY
--- openpkg-src/openpkg/HISTORY 24 Feb 2004 11:55:01 -0000 1.142.2.3
+++ openpkg-src/openpkg/HISTORY 5 Apr 2004 20:01:01 -0000 1.142.2.4
@@ -2,6 +2,15 @@
2004
====
+20040405 **** RELEASE AS PART OF OPENPKG 2.0.1 ***
+20040405 fix "openpkg man" command for embedded POD manual page rendering
+20040403 fix tracking of GNU tar
+20040401 fix "openpkg install openpkg-tool" bootstrapping command
+20040324 fix %l_check_nosource: the output went directly into the shell scripts
+20040320 upgrade to cURL 7.11.1
+20040320 bump provide for 2.0.0-2.0.0
+
+20040224 **** RELEASE AS PART OF OPENPKG 2.0.0 ***
20040224 use ~/.openpkg/warning instead of ~/.openpkg/timestamp for warning
timestamp file
20040223 change BeeCrypt building to use no assembly code at all
20040223 use a more smart rpm/rpm2cpio execution wrapper warning
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/install.sh
============================================================================
$ cvs diff -u -r1.1 -r1.1.2.1 install.sh
--- openpkg-src/openpkg/install.sh 16 Feb 2004 21:06:51 -0000 1.1
+++ openpkg-src/openpkg/install.sh 5 Apr 2004 20:01:01 -0000 1.1.2.1
@@ -1,3 +1,4 @@
[EMAIL PROTECTED]@/lib/openpkg/bash
##
## install -- OpenPKG Tool Chain "install" command (BOOSTRAP VERSION ONLY)
## Copyright (c) 2004 The OpenPKG Project <http://www.openpkg.org/>
@@ -32,11 +33,11 @@
if [ $# -eq 1 -a ".$1" = ".openpkg-tools" ]; then
:
else
- echo "openpkg:ERROR: still not available functionality \"$cmd $*\""
1>&2
- echo "openpkg: This functionality is provided by the \"openpkg-tools\" package
only!" 1>&2
- echo "openpkg: Run the command \"$OPENPKG_PREFIX/bin/openpkg install
openpkg-tools\" to" 1>&2
- echo "openpkg: bootstrap the \"openpkg-tools\" package for additional
functionality." 1>&2
- echo "openpkg: This bootstrap version only supports this particular install
command." 1>&2
+ echo "openpkg:ERROR: still not available functionality \"install $*\""
1>&2
+ echo "openpkg:INFO: This functionality is provided by the \"openpkg-tools\"
package only!" 1>&2
+ echo "openpkg:INFO: Run the command \"$OPENPKG_PREFIX/bin/openpkg install
openpkg-tools\" to" 1>&2
+ echo "openpkg:INFO: bootstrap the \"openpkg-tools\" package for additional
functionality." 1>&2
+ echo "openpkg:INFO: This bootstrap version only supports this particular
install command." 1>&2
exit 1
fi
@@ -72,7 +73,10 @@
fi
pkg_name=`$OPENPKG_PREFIX/lib/openpkg/curl -s -l "$url/" |\
egrep "^${pkg}-[0-9]" |\
- sed -e
"s;^${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.rpm.*;\\2:\\1;" |\
+ sed -e "s;^;X;" \
+ -e
"s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.rpm.*;\\2:\\1;" \
+ -e
"s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.sh.*;\\2:\\1;" \
+ -e "s;^X.*;;" |\
sort -r | head -1 |\
sed -e "s;^\\([^:]*\\):\\(.*\\);${pkg}-\\2-\\1;"`
if [ ".$pkg_name" != . ]; then
@@ -90,7 +94,7 @@
fi
# check whether package is already installed
- if [ ".`$OPENPKG_PREFIX/bin/openpkg rpm -q $pkg_name | grep -v 'is not
installed'`" != . ]; the
+ if [ ".`$OPENPKG_PREFIX/bin/openpkg rpm -q $pkg_name | grep -v 'is not
installed'`" != . ]; then
continue
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/man.sh
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 man.sh
--- openpkg-src/openpkg/man.sh 21 Feb 2004 19:15:23 -0000 1.1.2.1
+++ openpkg-src/openpkg/man.sh 5 Apr 2004 20:01:01 -0000 1.1.2.2
@@ -92,8 +92,11 @@
echo "openpkg:man:ERROR: unable to find POD to Roff converter
(pod2man)" 1>&2
exit 1
fi
- pod2roff="$pod2roff --section=${man_sect-1}"
- pod2roff="$pod2roff --release=\"$man_page(${man_sect-1})\""
+ if [ ".$man_sect" = . ]; then
+ man_sect=1
+ fi
+ pod2roff="$pod2roff --section=${man_sect}"
+ pod2roff="$pod2roff --release=\"$man_page(${man_sect})\""
pod2roff="$pod2roff --center=OpenPKG --date=OpenPKG"
pod2roff="$pod2roff --quotes=none"
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.295.2.8 -r1.295.2.9 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 24 Feb 2004 11:55:58 -0000 1.295.2.8
+++ openpkg-src/openpkg/openpkg.spec 5 Apr 2004 20:01:01 -0000 1.295.2.9
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.0.0
+%define V_openpkg 2.0.1
# the used software versions
%define V_rpm 4.2.1
@@ -140,7 +140,7 @@
AutoReq: no
AutoReqProv: no
Provides: OpenPKG
-Provides: openpkg = 20040224-20040224
+Provides: openpkg = 20040405-20040405
%description
This is the bootstrap package for the RPM-based Unix Software
@@ -206,7 +206,7 @@
prog openpkg:tar = {
version = %{V_tar}
url = ftp://alpha.gnu.org/gnu/tar/
- regex = tar-(\d+\.\d+\d.(2\d|9[3-9]))\.tar\.gz
+ regex = tar-(\d+\.\d+\d\.(2\d|9[4-9]))\.tar\.gz
}
prog openpkg:zlib = {
version = %{V_zlib}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.59 -r1.59.2.1 rpmmacros
--- openpkg-src/openpkg/rpmmacros 16 Feb 2004 21:06:51 -0000 1.59
+++ openpkg-src/openpkg/rpmmacros 5 Apr 2004 20:01:01 -0000 1.59.2.1
@@ -325,7 +325,7 @@
%integrity() %{l_check_nosource}
# macros for checking build environment
-%l_check_nosource() %(%{l_sane_env}; for url in . %{?_restricted}; do [
".$url" = .. ] && continue; eval `echo "$url" | sed -e
's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1 --> \\"; file=\\"\\2\\"!' -e
's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\"; file=\\"\\2\\"!' -e
's:^\\([^;].*\\)$:;url="(from unknown location) "; file="\\1":' -e 's:^;::'`; if [ !
-f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file" ]; then ( echo "Sorry, this
OpenPKG package contains a DISTRIBUTION RESTRICTED source file."; echo "Before you can
proceed building this package you have to MANUALLY fetch"; echo " ${url}${file}";
echo "and provide it locally under the path"; echo " %{_sourcedir}/$file" ) |
%{l_rpmtool} msg -b -t error; echo "exit 1"; fi; done)
+%l_check_nosource() %(%{l_sane_env}; for url in . %{?_restricted}; do [
".$url" = .. ] && continue; eval `echo "$url" | sed -e
's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1 --> \\"; file=\\"\\2\\"!' -e
's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\"; file=\\"\\2\\"!' -e
's:^\\([^;].*\\)$:;url="(from unknown location) "; file="\\1":' -e 's:^;::'`; if [ !
-f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file" ]; then echo "set +x"; ( echo
"Sorry, this OpenPKG package contains a DISTRIBUTION RESTRICTED source file."; echo
"Before you can proceed building this package you have to MANUALLY fetch"; echo "
${url}${file}"; echo "and provide it locally under the path"; echo "
%{_sourcedir}/$file" ) | %{l_rpmtool} msg -b -t error | sed -e 's;^;echo ";' -e
's;$;";'; echo "exit 1"; fi; done)
%l_check_class() %(%{l_sane_env}; class=`echo "%{?class}" | sed -e
's;^$;JUNK;'`; %{l_rpmtool} check-class "$class")
%prep %%prep\
%{l_check_nosource} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
