RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 10-Apr-2008 09:49:16
Branch: HEAD Handle: 2008041007491600
Modified files:
rpm CHANGES macros.in
Log:
proyvind: move some macros that's identical for each platform macros
to standard macros
Summary:
Revision Changes Path
1.2291 +1 -0 rpm/CHANGES
1.242 +10 -1 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2290 -r1.2291 CHANGES
--- rpm/CHANGES 6 Apr 2008 17:40:20 -0000 1.2290
+++ rpm/CHANGES 10 Apr 2008 07:49:16 -0000 1.2291
@@ -1,5 +1,6 @@
5.1b1 -> 5.2b1
+ - proyvind: move some macros that's identical for each platform macros
to standard macros
- rse: use latest POPT 1.14 for building with "devtool standalone"
- rse: prepared build-tree for RPM 5.2 development after branching
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.241 -r1.242 macros.in
--- rpm/macros.in 6 Mar 2008 22:35:27 -0000 1.241
+++ rpm/macros.in 10 Apr 2008 07:49:16 -0000 1.242
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.241 2008/03/06 22:35:27 afb Exp $
+# $Id: macros.in,v 1.242 2008/04/10 07:49:16 pkarlsen 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
@@ -1288,6 +1288,15 @@
%_mandir %{_prefix}/man
%_localedir %{_datadir}/locale
+%_initrddir %{_sysconfdir}/rc.d/init.d
+%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
+ && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
+ [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
+
+#---------------------------------------------------------------------
+# Multilibs
+%_multilibpatt
(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
+
#==============================================================================
# ---- config.guess platform macros.
# Macro(s) similar to the tokens used by configure.
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
