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 22:34:14
  Branch: HEAD                             Handle: 2007062721341301

  Modified files:
    rpm                     CHANGES Makefile.am configure.ac
    rpm/tools               Makefile.am

  Log:
    small build environment simplification:
    use regular LIBS for linking against SELinux library

  Summary:
    Revision    Changes     Path
    1.1407      +1  -0      rpm/CHANGES
    2.182       +0  -1      rpm/Makefile.am
    2.148       +1  -3      rpm/configure.ac
    2.92        +0  -1      rpm/tools/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1406 -r1.1407 CHANGES
  --- rpm/CHANGES	27 Jun 2007 20:32:58 -0000	1.1406
  +++ rpm/CHANGES	27 Jun 2007 20:34:13 -0000	1.1407
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: use regular LIBS for linking against SELinux library
       - rse: no longer re-build db_xxx utilities in rpmdb/ -- use already built db3/ versions instead
       - rse: no longer any librpm* libraries against external third-party libraries (rely on pkg-config)
       - rse: link all internal third-party libraries into librpmmisc exclusively
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.181 -r2.182 Makefile.am
  --- rpm/Makefile.am	27 Jun 2007 20:20:26 -0000	2.181
  +++ rpm/Makefile.am	27 Jun 2007 20:34:13 -0000	2.182
  @@ -55,7 +55,6 @@
   	$(top_builddir)/rpmdb/librpmdb.la \
   	$(top_builddir)/rpmio/librpmio.la \
   	$(top_builddir)/misc/librpmmisc.la \
  -	@WITH_SELINUX_LIB@ \
   	@LTLIBINTL@
   
   bin_PROGRAMS = 		rpm rpmbuild
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.147 -r2.148 configure.ac
  --- rpm/configure.ac	27 Jun 2007 20:20:26 -0000	2.147
  +++ rpm/configure.ac	27 Jun 2007 20:34:13 -0000	2.148
  @@ -600,14 +600,12 @@
   AC_SUBST(WITH_LIBELF_DEBUGEDIT)
   
   dnl # optional SELinux support
  -WITH_SELINUX_LIB=""
   AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [build RPM with SELinux support]), [
       if test ".$withval" = .yes; then
           AC_DEFINE(WITH_SELINUX, 1, [Build with SELinux support?])
  -        WITH_SELINUX_LIB="-lselinux"
  +        LIBS="$LIBS -lselinux"
       fi
   ])
  -AC_SUBST(WITH_SELINUX_LIB)
   
   dnl # optional Perl language bindings
   WITH_PERL_SUBDIR=""
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/Makefile.am
  ============================================================================
  $ cvs diff -u -r2.91 -r2.92 Makefile.am
  --- rpm/tools/Makefile.am	27 Jun 2007 20:20:27 -0000	2.91
  +++ rpm/tools/Makefile.am	27 Jun 2007 20:34:14 -0000	2.92
  @@ -19,7 +19,6 @@
   	$(top_builddir)/rpmdb/librpmdb.la \
   	$(top_builddir)/rpmio/librpmio.la \
   	$(top_builddir)/misc/librpmmisc.la \
  -	@WITH_SELINUX_LIB@ \
   	@LTLIBINTL@
   
   pkglibdir =		@USRLIBRPM@
  @@ .