RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 27-Sep-2010 23:16:40
Branch: rpm-5_3 Handle: 2010092721163900
Modified files: (Branch: rpm-5_3)
rpm CHANGES rpmpopt.in
Log:
- added --withoutcheck popt alias (#lp:634104) (#mdvbz:35423)
Summary:
Revision Changes Path
1.3296.2.82 +1 -0 rpm/CHANGES
2.86.2.2 +3 -1 rpm/rpmpopt.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.81 -r1.3296.2.82 CHANGES
--- rpm/CHANGES 27 Sep 2010 19:29:39 -0000 1.3296.2.81
+++ rpm/CHANGES 27 Sep 2010 21:16:39 -0000 1.3296.2.82
@@ -1,5 +1,6 @@
5.3.3 -> 5.3.4:
- jbj: rpmrepo: move from rpmio -> rpmdb to finish tools/rpmrepo.c gutting.
+ - devzero2000 : added --withoutcheck popt alias (#lp:634104) (#mdvbz:35423)
- jbj: perl: don't automate use RPM, @INC issues need to be solved first.
- jbj: macosx: avoid <unistd.h> uuid_t typedef, permit --with-uuid.
- jbj: macosx: add -fnested-functions (when available).
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
============================================================================
$ cvs diff -u -r2.86.2.1 -r2.86.2.2 rpmpopt.in
--- rpm/rpmpopt.in 18 Sep 2010 18:25:04 -0000 2.86.2.1
+++ rpm/rpmpopt.in 27 Sep 2010 21:16:39 -0000 2.86.2.2
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.86.2.1 2010/09/18 18:25:04 jbj Exp $
+# $Id: rpmpopt.in,v 2.86.2.2 2010/09/27 21:16:39 jbj Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -444,5 +444,7 @@
--define '_use_internal_dependency_generator 0' \
--notinlsb
+rpmbuild alias --withoutcheck --define 'check exit 0' \
+ --POPTdesc=$"disable %check stanza for build"
# \endverbatim
#*/
@@ .
Received on Mon Sep 27 23:16:40 2010