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 openpkg-web Date: 12-Jan-2004 13:35:30
Branch: HEAD Handle: 2004011212352802
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
openpkg-web news.txt
Log:
- fix RPM internal handling of %_excludedocs macro
- fix config.cache file handling in building of GNU tar and GNU patch
Summary:
Revision Changes Path
1.104 +2 -0 openpkg-src/openpkg/HISTORY
1.262 +14 -10 openpkg-src/openpkg/openpkg.spec
1.38 +22 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.39 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.47 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.37 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.8057 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.103 -r1.104 HISTORY
--- openpkg-src/openpkg/HISTORY 7 Jan 2004 10:24:03 -0000 1.103
+++ openpkg-src/openpkg/HISTORY 12 Jan 2004 12:35:29 -0000 1.104
@@ -2,6 +2,8 @@
2004
====
+20040112 fix RPM internal handling of %_excludedocs macro
+20040107 fix config.cache file handling in building of GNU tar and GNU patch
20040107 downgrade to GNU tar 1.13.25 again because --no-recursion is broken in <=
1.13.92
20040105 exclude %doc flagged files by default.
20040102 make sure rpmtool exists (important on bootstrapping with openpkg.boot)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.261 -r1.262 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 7 Jan 2004 17:07:52 -0000 1.261
+++ openpkg-src/openpkg/openpkg.spec 12 Jan 2004 12:35:29 -0000 1.262
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040107
+%define V_openpkg 20040112
# the used software versions
%define V_rpm 4.2.1
@@ -375,12 +375,14 @@
# bootstrap GNU patch tool
( cd patch-%{V_patch}
- echo 'ac_cv_func_setmode=${ac_cv_func_setmode=no}' >config.cache
- echo "ac_cv_prog_cc_g=no" >>config.cache
- false=`sh $shtool path false`
- echo "ac_cv_path_ed_PROGRAM=\${ac_cv_path_ed_PROGRAM=$false}" >>config.cache
+ ( echo 'ac_cv_func_setmode=${ac_cv_func_setmode=no}'
+ echo 'ac_cv_prog_cc_g=no'
+ false=`sh $shtool path false`
+ echo "ac_cv_path_ed_PROGRAM=\${ac_cv_path_ed_PROGRAM=$false}"
+ ) >config.cache
CC="${l_cc}" \
./configure \
+ --cache-file=./config.cache \
--disable-largefile
${l_make}
( mv patch ..; ${l_make} clean || true; mv ../patch . ) || exit $?
@@ -466,11 +468,13 @@
# build GNU tar tool
( cd tar-%{V_tar}
- echo 'am_cv_func_iconv=${am_cv_func_iconv=no}' >config.cache
- echo 'am_cv_lib_iconv=${am_cv_lib_iconv=no}' >>config.cache
- echo 'am_cv_func_iconv=${am_cv_func_iconv=no}' >>config.cache
- echo 'ac_cv_prog_cc_g=no' >>config.cache
- sh $shtool subst -e 's;^rm conftest.sed;rm -f conftest.sed;' configure
+ ( echo 'am_cv_func_iconv=${am_cv_func_iconv=no}'
+ echo 'am_cv_lib_iconv=${am_cv_lib_iconv=no}'
+ echo 'ac_cv_prog_cc_g=no'
+ ) >config.cache
+ sh $shtool subst \
+ -e 's;^rm conftest\.sed;rm -f conftest.sed;' \
+ configure
CC="${l_cc}"
../bash-%{V_bash}/bash \
./configure \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.37 -r1.38 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 7 Jan 2004 10:01:24 -0000 1.37
+++ openpkg-src/openpkg/rpm.patch.bugfix 12 Jan 2004 12:35:29 -0000 1.38
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 06-Jan-2004
+## Created on: 07-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -276,6 +276,27 @@
dColors[dirIndexes[i]] |= fColors[i];
/*
* See if this file path needs relocating.
+
++---------------------------------------------------------------------------
+| The "%_excludedocs" macro is intended to set the _default_ if
+| both --excludedocs and --includedocs are not specified and it is
+| evaluated already before. So, do not override it here again, because
+| it would not allow us to make "%_excludedocs 1" the default.
++---------------------------------------------------------------------------
+Index: lib/transaction.c
+--- lib/transaction.c 15 Jul 2003 15:15:47 -0000 1.1.1.15
++++ lib/transaction.c 7 Jan 2004 15:54:55 -0000
+@@ -702,8 +702,10 @@
+ int dc;
+ int i, j;
+
++#if 0
+ if (!noDocs)
+ noDocs = rpmExpandNumeric("%{_excludedocs}");
++#endif
+
+ { const char *tmpPath = rpmExpand("%{_netsharedpath}", NULL);
+ /[EMAIL PROTECTED]@*/
+---------------------------------------------------------------------------
| Bugfix: POSIX/SUSv3 clearly expresses that fcntl(2) returns "value
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.38 -r1.39 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 7 Jan 2004 10:01:24 -0000 1.38
+++ openpkg-src/openpkg/rpm.patch.feature 12 Jan 2004 12:35:30 -0000 1.39
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 06-Jan-2004
+## Created on: 07-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.46 -r1.47 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 7 Jan 2004 10:01:24 -0000 1.46
+++ openpkg-src/openpkg/rpm.patch.porting 12 Jan 2004 12:35:30 -0000 1.47
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 06-Jan-2004
+## Created on: 07-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.36 -r1.37 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 7 Jan 2004 10:01:24 -0000 1.36
+++ openpkg-src/openpkg/rpm.patch.regen 12 Jan 2004 12:35:30 -0000 1.37
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 06-Jan-2004
+## Created on: 07-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8056 -r1.8057 news.txt
--- openpkg-web/news.txt 12 Jan 2004 12:10:44 -0000 1.8056
+++ openpkg-web/news.txt 12 Jan 2004 12:35:28 -0000 1.8057
@@ -1,3 +1,4 @@
+12-Jan-2004: Upgraded package: P<openpkg-20040112-20040112>
12-Jan-2004: Upgraded package: P<mysql41-4.1.1-20040112>
12-Jan-2004: Upgraded package: P<bzip2-1.0.2-20040112>
12-Jan-2004: Upgraded package: P<fsl-1.4.0-20040112>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
