The branch, v3-5-test has been updated
via 11a6d88... s3:packaging: Fix building RHEL packages.
from 8395c1d... s4-torture: take privileges into account in
BASE-MAXIMUM_ALLOWED
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 11a6d88ea387fa50690880561f0ffffefbeb8956
Author: Karolin Seeger <ksee...@samba.org>
Date: Fri Oct 16 16:00:26 2009 +0200
s3:packaging: Fix building RHEL packages.
Fix bug #6721.
Thanks to Eero Volotinen <eero.voloti...@medicel.com> for providing the
patch!
Karolin
(cherry picked from commit 79c2c61b99eb7c47c8bfbbb479d9d2197d1ad1fb)
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL/makerpms.sh.tmpl | 4 ++--
packaging/RHEL/samba.spec.tmpl | 25 +++++++++++++++++++++----
2 files changed, 23 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/makerpms.sh.tmpl b/packaging/RHEL/makerpms.sh.tmpl
index 5b377bd..93d2d82 100644
--- a/packaging/RHEL/makerpms.sh.tmpl
+++ b/packaging/RHEL/makerpms.sh.tmpl
@@ -40,8 +40,8 @@ case $RPMVER in
esac
pushd .
-cd ../../source
-if [ -f Makefile ]; then
+cd ../../source3
+if [ -f Makefile ]; then
make distclean
fi
popd
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 15deecd..4d27b1a 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -174,8 +174,7 @@ if [ ${CC_MAJOR} -ge 3 ]; then
fi
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
- all modules pam_smbpass
+make all modules pam_smbpass
# Remove some permission bits to avoid to many dependencies
cd ..
@@ -210,8 +209,8 @@ make DESTDIR=$RPM_BUILD_ROOT \
cd ..
# NSS winbind support
-install -m 755 source3/nsswitch/libnss_winbind.so
$RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
-install -m 755 source3/nsswitch/libnss_wins.so
$RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so.2
+install -m 755 nsswitch/libnss_winbind.so
$RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 nsswitch/libnss_wins.so
$RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so.2
( cd $RPM_BUILD_ROOT/%{_libarch};
ln -sf libnss_winbind.so.2 libnss_winbind.so;
ln -sf libnss_wins.so.2 libnss_wins.so )
@@ -440,6 +439,24 @@ fi
%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/ar/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/da/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/es/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/fi/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/fr/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/hu/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/it/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/ja/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/ko/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/nb/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/nl/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/pl/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/ru/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
%{_includedir}/libsmbclient.h
%{_libarchdir}/libsmbclient.*
--
Samba Shared Repository
