samba-cvs.cvs
[Top] [All Lists]

[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 360e4efe1e31e43

Subject: [SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 360e4efe1e31e4399a56d6984caf6dac7d5cc648
From: Michael Adam
Date: Thu, 20 Aug 2009 07:16:12 -0500 CDT
The branch, v3-4-ctdb has been updated
       via  360e4efe1e31e4399a56d6984caf6dac7d5cc648 (commit)
       via  ffa4ff1c52022bab4ac6449387f0f17f462ac58a (commit)
      from  75c6a4d978dfd81ad24eff9e0404337c558e2d69 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -----------------------------------------------------------------
commit 360e4efe1e31e4399a56d6984caf6dac7d5cc648
Author: Michael Adam <obnox@xxxxxxxxx>
Date:   Thu Aug 20 13:37:11 2009 +0200

    packaging(RHEL-CTDB): enable parallel build
    
    Michael

commit ffa4ff1c52022bab4ac6449387f0f17f462ac58a
Author: Michael Adam <obnox@xxxxxxxxx>
Date:   Thu Aug 20 13:33:42 2009 +0200

    packaging(RHEL-CTDB): fix packaging of pam_winbind.mo file
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 packaging/RHEL-CTDB/samba.spec.tmpl |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl 
b/packaging/RHEL-CTDB/samba.spec.tmpl
index a84a5cf..48b2c5c 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -43,6 +43,7 @@ BuildRequires: pam-devel, readline-devel, fileutils, 
libacl-devel, openldap-deve
 
 %define _libarchdir /usr/%{_libarch}
 
+%define numcpu  %(grep "^processor" /proc/cpuinfo |wc -l | sed -e 's/^0$/1/')
 
 %description
 Samba is the protocol by which a lot of PC-related machines share
@@ -200,7 +201,7 @@ if [ ${CC_MAJOR} -ge 3 ]; then
         fi
 fi
 
-make %{?_smp_mflags} \
+make -j%{numcpu} %{?_smp_mflags} \
        nss_modules pam_modules
 
 rm -rf %{_32bit_tmp_dir}
@@ -266,7 +267,7 @@ if [ ${CC_MAJOR} -ge 3 ]; then
 fi
 
 
-make %{?_smp_mflags} \
+make -j %{numcpu} %{?_smp_mflags} \
        all modules pam_smbpass
 
 # Remove some permission bits to avoid to many dependencies
@@ -546,7 +547,7 @@ exit 0
 %attr(755,root,root) /%{_libarch}/libnss_winbind.so*
 %attr(755,root,root) /%{_libarch}/security/pam_winbind.so
 %attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
-/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/*/LC_MESSAGES/pam_winbind.mo
 
 %{_libarchdir}/samba/idmap/*.so
 %{_libarchdir}/samba/nss_info/*.so


-- 
SAMBA-CTDB repository

<Prev in Thread] Current Thread [Next in Thread>
  • [SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 360e4efe1e31e4399a56d6984caf6dac7d5cc648, Michael Adam <=