RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES configure.ac rpm/scripts/ Makefile.am rpm.pc.i...

From: Ralf S. Engelschall <rse@rpm5.org>
Date: Wed 27 Jun 2007 - 14:24:45 CEST
Message-Id: <20070627122445.E99D03484E4@rpm5.org>
  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:   27-Jun-2007 14:24:45
  Branch: HEAD                             Handle: 2007062713244400

  Added files:
    rpm/scripts             rpm.pc.in
  Modified files:
    rpm                     CHANGES configure.ac
    rpm/scripts             Makefile.am

  Log:
    Install a pkg-config(1) specification file "rpm.pc" for correctly
    linking against the RPM C API, including the dependency libraries which
    are found in LDFLAGS and LIBS.

  Summary:
    Revision    Changes     Path
    1.1405      +1  -0      rpm/CHANGES
    2.146       +1  -1      rpm/configure.ac
    1.39        +4  -0      rpm/scripts/Makefile.am
    1.1         +17 -0      rpm/scripts/rpm.pc.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1404 -r1.1405 CHANGES
  --- rpm/CHANGES	27 Jun 2007 10:13:27 -0000	1.1404
  +++ rpm/CHANGES	27 Jun 2007 12:24:44 -0000	1.1405
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: install a pkg-config(1) specification "rpm.pc" for correctly linking against the RPM C API
       - rse: consistently move libraries from Automake _LDFLAGS to _LIBADD variables
       - rse: move misc/*.c from rpmio/stubs.c into misc/librpmmisc.c and build regular librpmmisc.la
       - rse: support building without ZLib via --without-zlib
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.145 -r2.146 configure.ac
  --- rpm/configure.ac	27 Jun 2007 10:04:33 -0000	2.145
  +++ rpm/configure.ac	27 Jun 2007 12:24:44 -0000	2.146
  @@ -1009,7 +1009,7 @@
       scripts/macros.python tools/Makefile misc/Makefile doc/Makefile
       doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
       doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile
  -    python/rpm/Makefile lua/Makefile
  +    python/rpm/Makefile lua/Makefile scripts/rpm.pc
   ])
   
   dnl # explicit list of commands to execute
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.38 -r1.39 Makefile.am
  --- rpm/scripts/Makefile.am	20 Jun 2007 16:56:47 -0000	1.38
  +++ rpm/scripts/Makefile.am	27 Jun 2007 12:24:44 -0000	1.39
  @@ -47,3 +47,7 @@
   	rpm.daily rpm.log rpm.xinetd \
   	symclash.py symclash.sh tgpg u_pkg.sh \
   	vpkg-provides.sh vpkg-provides2.sh
  +
  +pkgconfigdir = $(libdir)/pkgconfig
  +pkgconfig_DATA = rpm.pc
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/rpm.pc.in
  ============================================================================
  $ cvs diff -u -r0 -r1.1 rpm.pc.in
  --- /dev/null	2007-06-27 14:22:00 +0200
  +++ rpm.pc.in	2007-06-27 14:24:45 +0200
  @@ -0,0 +1,17 @@
  +##
  +##  rpm.pc -- RPM pkg-config(1) specification
  +##
  +
  +prefix=@prefix@
  +exec_prefix=@exec_prefix@
  +includedir=@includedir@
  +libdir=@libdir@
  +
  +Name: @PACKAGE_NAME@
  +Description: RPM Package Manager
  +Version: @PACKAGE_VERSION@
  +URL: http://rpm5.org/
  +Cflags: -I${includedir}/rpm
  +Libs: -L${libdir} -lrpmbuild -lrpm -lrpmdb -lrpmio -lrpmmisc
  +Libs.private: @LDFLAGS@ @LIBS@
  +
  @@ .
Received on Wed Jun 27 14:24:45 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.