diff options
author | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
commit | 7c51fa6d699a653cafa90df8e44911b576118ebd (patch) | |
tree | 543bf9ca698e03eff81104898b33e77f1abed319 /packaging | |
parent | cc3a6770c77ec8fe1cd63bf4c682853c56201f0c (diff) | |
parent | 3e3214fd91471bca5b6c4d3782e922d252d588fb (diff) | |
download | samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.gz samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.bz2 samba-7c51fa6d699a653cafa90df8e44911b576118ebd.zip |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/RHEL/makerpms.sh.tmpl | 4 | ||||
-rw-r--r-- | packaging/RHEL/samba.spec.tmpl | 25 |
2 files changed, 23 insertions, 6 deletions
diff --git a/packaging/RHEL/makerpms.sh.tmpl b/packaging/RHEL/makerpms.sh.tmpl index 5b377bda57..93d2d82692 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 15deecd75a..4d27b1a9a8 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.* |