[CVS] RPM: rpm-5_3: rpm/scripts/ rpm.daily trpm

2011-01-25 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   25-Jan-2011 16:17:26
  Branch: rpm-5_3  Handle: 2011012515172302

  Modified files:   (Branch: rpm-5_3)
rpm/scripts rpm.daily trpm

  Log:
don't make path to rpm binary absolute

  Summary:
RevisionChanges Path
1.3.10.2+1  -1  rpm/scripts/rpm.daily
1.12.18.2   +3  -3  rpm/scripts/trpm
  

  patch -p0 '@@ .'
  Index: rpm/scripts/rpm.daily
  
  $ cvs diff -u -r1.3.10.1 -r1.3.10.2 rpm.daily
  --- rpm/scripts/rpm.daily 12 Jan 2011 22:02:45 -  1.3.10.1
  +++ rpm/scripts/rpm.daily 25 Jan 2011 15:17:25 -  1.3.10.2
  @@ -1,3 +1,3 @@
   #!/bin/sh
   
  -/usr/bin/rpm -qa 21 | sort  /var/log/rpmpkgs
  +rpm -qa 21 | sort  /var/log/rpmpkgs
  @@ .
  patch -p0 '@@ .'
  Index: rpm/scripts/trpm
  
  $ cvs diff -u -r1.12.18.1 -r1.12.18.2 trpm
  --- rpm/scripts/trpm  12 Jan 2011 22:02:45 -  1.12.18.1
  +++ rpm/scripts/trpm  25 Jan 2011 15:17:23 -  1.12.18.2
  @@ -10,9 +10,9 @@
   rpmi=$rpm
   #rpmi=/usr/lib/rpm/rpmi
   rpmb=/usr/bin/rpmbuild
  -rpmq=/usr/bin/rpm
  -rpmdb=/usr/bin/rpm
  -rpmk=/usr/bin/rpms
  +rpmq=$rpm
  +rpmdb=$rpm
  +rpmk=$rpm
   
   pgppubkey=`echo /usr/share/doc/rpm-4*/RPM-PGP-KEY`
   gpgpubkey=`echo /usr/share/doc/rpm-4*/RPM-GPG-KEY`
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/scripts/ rpm.daily trpm

2011-01-12 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   12-Jan-2011 23:02:45
  Branch: rpm-5_3  Handle: 2011011222024500

  Modified files:   (Branch: rpm-5_3)
rpm/scripts rpm.daily trpm

  Log:
fix use of no longer produced binaries such as 'rpmquery'.

  Summary:
RevisionChanges Path
1.3.10.1+1  -2  rpm/scripts/rpm.daily
1.12.18.1   +3  -3  rpm/scripts/trpm
  

  patch -p0 '@@ .'
  Index: rpm/scripts/rpm.daily
  
  $ cvs diff -u -r1.3 -r1.3.10.1 rpm.daily
  --- rpm/scripts/rpm.daily 25 May 2007 17:36:39 -  1.3
  +++ rpm/scripts/rpm.daily 12 Jan 2011 22:02:45 -  1.3.10.1
  @@ -1,4 +1,3 @@
   #!/bin/sh
   
  -/usr/bin/rpmquery -qa --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n' 
21 \
  - | sort  /var/log/rpmpkgs
  +/usr/bin/rpm -qa 21 | sort  /var/log/rpmpkgs
  @@ .
  patch -p0 '@@ .'
  Index: rpm/scripts/trpm
  
  $ cvs diff -u -r1.12 -r1.12.18.1 trpm
  --- rpm/scripts/trpm  16 Jan 2003 16:59:47 -  1.12
  +++ rpm/scripts/trpm  12 Jan 2011 22:02:45 -  1.12.18.1
  @@ -10,9 +10,9 @@
   rpmi=$rpm
   #rpmi=/usr/lib/rpm/rpmi
   rpmb=/usr/bin/rpmbuild
  -rpmq=/usr/bin/rpmquery
  -rpmdb=/usr/bin/rpmdb
  -rpmk=/usr/bin/rpmsign
  +rpmq=/usr/bin/rpm
  +rpmdb=/usr/bin/rpm
  +rpmk=/usr/bin/rpms
   
   pgppubkey=`echo /usr/share/doc/rpm-4*/RPM-PGP-KEY`
   gpgpubkey=`echo /usr/share/doc/rpm-4*/RPM-GPG-KEY`
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org