RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 27-Dec-2007 17:44:14
Branch: HEAD Handle: 2007122716441300
Modified files:
rpm CHANGES configure.ac macros.in
Log:
configure/macroize file extensions (for Darwin and Cygwin)
Summary:
Revision Changes Path
1.2023 +1 -0 rpm/CHANGES
2.267 +16 -0 rpm/configure.ac
1.222 +6 -1 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2022 -r1.2023 CHANGES
--- rpm/CHANGES 27 Dec 2007 14:16:11 -0000 1.2022
+++ rpm/CHANGES 27 Dec 2007 16:44:13 -0000 1.2023
@@ -1,4 +1,5 @@
5.0b3 -> 5.0b4:
+ - afb: added %__objext,%__libext,%__shlibext,%__exeext for file
extensions.
- rse: make size of line buffer for .spec file parsing run-time
configurable via macro _spec_line_buffer_size
- rse: improve %patch macro implementation: less expansion redundancy
and macro namespace collision avoidance
- rse: fix %{uncompress:<file>.lzo} by passing the required "-dc"
options to LZOP's lzop(1)
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.266 -r2.267 configure.ac
--- rpm/configure.ac 14 Dec 2007 23:20:34 -0000 2.266
+++ rpm/configure.ac 27 Dec 2007 16:44:13 -0000 2.267
@@ -1284,6 +1284,22 @@
)
AC_SUBST(usrprefix)
+dnl # Object file suffix (normally "o").
+objext="$ac_cv_objext"
+AC_SUBST(objext)
+
+dnl # Static library suffix (normally "a").
+libext="$acl_cv_libext"
+AC_SUBST(libext)
+
+dnl # Shared library suffix (normally "so").
+shlibext="$acl_cv_shlibext"
+AC_SUBST(shlibext)
+
+dnl # Executable file suffix (normally "").
+exeext="$ac_exeext"
+AC_SUBST(exeext)
+
dnl # determine RPM database directory path
AC_MSG_CHECKING([for RPM database directory])
DBPATH=`echo "${varprefix}/lib/rpm"`
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.221 -r1.222 macros.in
--- rpm/macros.in 27 Dec 2007 14:16:11 -0000 1.221
+++ rpm/macros.in 27 Dec 2007 16:44:13 -0000 1.222
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.221 2007/12/27 14:16:11 rse Exp $
+# $Id: macros.in,v 1.222 2007/12/27 16:44:13 afb Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -33,6 +33,11 @@
%_usrlibrpm @USRLIBRPM@
%_etcrpm @SYSCONFIGDIR@
+%__objext @objext@
+%__libext @libext@
+%__shlibext @shlibext@
+%__exeext @[EMAIL PROTECTED]
+
%_rpmhome %{_usrlibrpm}
#==============================================================================
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
