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: 14-Apr-2004 17:13:14
Branch: HEAD Handle: 2004041416131400
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmpopt
Log:
- fix "rpm --help" output related to option "--with"
- fix building of GNU tar by applying more "no iconv here" enforcement
Submitted partly by: Matthias Kurz
Summary:
Revision Changes Path
1.160 +2 -0 openpkg-src/openpkg/HISTORY
1.315 +6 -4 openpkg-src/openpkg/openpkg.spec
1.18 +1 -1 openpkg-src/openpkg/rpmpopt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.159 -r1.160 HISTORY
--- openpkg-src/openpkg/HISTORY 9 Apr 2004 20:04:43 -0000 1.159
+++ openpkg-src/openpkg/HISTORY 14 Apr 2004 15:13:14 -0000 1.160
@@ -2,6 +2,8 @@
2004
====
+20040414 fix "rpm --help" output related to option "--with"
+20040414 fix building of GNU tar by applying more "no iconv here" enforcement
20040409 removed old RPM extensions (now part of "openpkg-tools")
20040409 worked-off <prefix>/bin/openpkg frontend in order to provide better tool
chain processing
20040408 fixed internal OPENPKG_TOOLS variable processing in <prefix>/bin/openpkg
frontend
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.314 -r1.315 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 9 Apr 2004 20:04:43 -0000 1.314
+++ openpkg-src/openpkg/openpkg.spec 14 Apr 2004 15:13:14 -0000 1.315
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040409
+%define V_openpkg 20040414
# the used software versions
%define V_rpm 4.2.1
@@ -550,9 +550,11 @@
# build GNU tar tool
( cd tar-%{V_tar}
- ( 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'
+ ( echo 'am_cv_func_iconv=no'
+ echo 'am_cv_lib_iconv=no'
+ echo 'ac_cv_lib_iconv_iconv=no'
+ echo 'ac_cv_header_iconv_h=no'
+ echo 'ac_cv_type_iconv_t=no'
) >config.cache
sh $shtool subst \
-e 's;^rm conftest\.sed;rm -f conftest.sed;' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmpopt
============================================================================
$ cvs diff -u -r1.17 -r1.18 rpmpopt
--- openpkg-src/openpkg/rpmpopt 9 Apr 2004 20:04:43 -0000 1.17
+++ openpkg-src/openpkg/rpmpopt 14 Apr 2004 15:13:14 -0000 1.18
@@ -39,7 +39,7 @@
# RPM extension: "rpm --with[out] <name>"
rpm alias --with --define "with_!#:+ yes" \
- --POPTdesc=$"set '%option <name> yes'" \
+ --POPTdesc=$"set '%option with_<name> yes'" \
--POPTargs=$"<name>"
rpm alias --without --define "with_!#:+ no" \
--POPTdesc=$"set '%option with_<name> no'" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
