RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/ CHANGES VENDOR configure.ac rpm/lib/ poptALL.c rpm/ rp...

From: Jeff Johnson <n3npq@mac.com>
Date: Thu 06 Dec 2007 - 17:33:59 CET
Message-Id: <5E34DB74-C2BE-475D-B6CA-628622B10D52@mac.com>
The rpmlibFoo() identifiers get displayed right next to this line.

I've not gotten to writing the thundering herd of
     RPMLIB_VERSION_DECODE_T
     ...
macros yet.

but perhaps "Version: 0x%08x Timestamp: 0x%08x Vendor: 0x%08x\n"
will suffice for beta1. todo++

73 de Jeff

On Dec 6, 2007, at 11:25 AM, Ralf S. Engelschall wrote:

>   RPM Package Manager, CVS Repository
>   http://rpm5.org/cvs/
>    
> ______________________________________________________________________ 
> ______
>
>   Server: rpm5.org                         Name:   Ralf S. Engelschall
>   Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
>   Module: rpm                              Date:   06-Dec-2007  
> 17:25:28
>   Branch: HEAD                             Handle: 2007120616252800
>
>   Modified files:
>     rpm                     CHANGES VENDOR configure.ac rpmqv.c
>     rpm/lib                 poptALL.c
>
>   Log:
>     Provide --with-name=NAME Autoconf option to allow all packagers to
>     "brand" RPM without having to patch the code.
>
>   Summary:
>     Revision    Changes     Path
>     1.1946      +1  -0      rpm/CHANGES
>     2.2         +0  -6      rpm/VENDOR
>     2.261       +8  -0      rpm/configure.ac
>     2.59        +1  -6      rpm/lib/poptALL.c
>     1.129       +1  -6      rpm/rpmqv.c
>    
> ______________________________________________________________________ 
> ______
>
>   patch -p0 <<'@@ .'
>   Index: rpm/CHANGES
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.1945 -r1.1946 CHANGES
>   --- rpm/CHANGES	6 Dec 2007 14:47:47 -0000	1.1945
>   +++ rpm/CHANGES	6 Dec 2007 16:25:28 -0000	1.1946
>   @@ -1,4 +1,5 @@
>    5.0a4 -> 5.0b1:
>   +    - rse: provide --with-name=NAME Autoconf option to allow  
> packagers to "brand" RPM
>        - rse: apply all remaining OpenPKG patches -- fully disabled  
> by default under defined(RPM_VENDOR_OPENPKG)
>        - jbj: flesh out rpmssl implementation. DSA seems OK, no  
> clue RSA yet.
>        - jbj: flesh out rpmgc implementation. stil buggy ...
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/VENDOR
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.1 -r2.2 VENDOR
>   --- rpm/VENDOR	6 Dec 2007 14:47:47 -0000	2.1
>   +++ rpm/VENDOR	6 Dec 2007 16:25:28 -0000	2.2
>   @@ -92,12 +92,6 @@
>         Hint:           This is not tested at all as it is still  
> unused!
>          
> ______________________________________________________________________ 
> __
>
>   -     Change:         branding
>   -     Purpose:        Apply some branding for the OpenPKG  
> distribution.
>   -     Reason:         To make sure the users notice that this is  
> not 100%
>   -                     a standard RPM from rpm5.org which is used  
> by OpenPKG.
>   -      
> ______________________________________________________________________ 
> __
>   -
>         Change:         no-deps-on-building-srpms
>         Purpose:        Do not perform any dependency checking on  
> building SRPMs.
>         Reason:         We never found any reason why this is of  
> any benefit for
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/configure.ac
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.260 -r2.261 configure.ac
>   --- rpm/configure.ac	5 Dec 2007 08:16:52 -0000	2.260
>   +++ rpm/configure.ac	6 Dec 2007 16:25:28 -0000	2.261
>   @@ -21,6 +21,14 @@
>    AC_REQUIRE_AUX_FILE([mkinstalldirs])
>    AM_MAINTAINER_MODE
>
>   +dnl # allow packagers to override the officially branding name
>   +RPM_NAME="RPM"
>   +AC_ARG_WITH(name,
>   +    AS_HELP_STRING([--with-name=NAME], [set official name of  
> program (default: "RPM")]), [dnl
>   +    RPM_NAME="$withval"
>   +])
>   +AC_DEFINE_UNQUOTED(RPM_NAME, "$RPM_NAME", [official name of  
> program])
>   +
>    dnl # allow packagers to override the bugreport address
>    AC_ARG_WITH(bugreport,
>        AS_HELP_STRING([--with-bugreport=ADDRESS], [set packager  
> bugreport Email/Web address (PACKAGE_BUGREPORT_DEFAULT)]), [dnl
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/lib/poptALL.c
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.58 -r2.59 poptALL.c
>   --- rpm/lib/poptALL.c	6 Dec 2007 14:47:49 -0000	2.58
>   +++ rpm/lib/poptALL.c	6 Dec 2007 16:25:28 -0000	2.59
>   @@ -180,12 +180,7 @@
>    	/*@globals rpmEVR, fileSystem @*/
>    	/*@modifies *fp, fileSystem @*/
>    {
>   -#if defined(RPM_VENDOR_OPENPKG) /* branding */
>   -    /* use OpenPKG branding */
>   -    fprintf(fp, _("OpenPKG RPM %s\n"), rpmEVR);
>   -#else
>   -    fprintf(fp, _("RPM version %s\n"), rpmEVR);
>   -#endif
>   +    fprintf(fp, _("%s version %s\n"), RPM_NAME, rpmEVR);
>    }
>
>    void rpmcliConfigured(void)
>   @@ .
>   patch -p0 <<'@@ .'
>   Index: rpm/rpmqv.c
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.128 -r1.129 rpmqv.c
>   --- rpm/rpmqv.c	6 Dec 2007 14:47:47 -0000	1.128
>   +++ rpm/rpmqv.c	6 Dec 2007 16:25:28 -0000	1.129
>   @@ -149,12 +149,7 @@
>    	/*@globals rpmEVR, fileSystem @*/
>    	/*@modifies *fp, fileSystem @*/
>    {
>   -#if defined(RPM_VENDOR_OPENPKG) /* branding */
>   -    /* use OpenPKG branding */
>   -    fprintf(fp, _("OpenPKG RPM %s\n"), rpmEVR);
>   -#else
>   -    fprintf(fp, _("RPM version %s\n"), rpmEVR);
>   -#endif
>   +    fprintf(fp, _("%s version %s\n"), RPM_NAME, rpmEVR);
>    }
>
>    static void printUsage(poptContext con, FILE * fp, int flags)
>   @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org
Received on Thu Dec 6 17:34:25 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.