diff options
author | Gerald Carter <jerry@samba.org> | 2006-05-23 15:21:55 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2006-05-23 15:21:55 +0000 |
commit | 3f7bb704a9e62e7a46a05838ec9300c2f6916c16 (patch) | |
tree | e2ca7f1b8da68d725e5359d7746f391fedcad6be /packaging | |
parent | 34b471724d1c8eb9e020fce02fc538bd0993d1c4 (diff) | |
download | samba-3f7bb704a9e62e7a46a05838ec9300c2f6916c16.tar.gz samba-3f7bb704a9e62e7a46a05838ec9300c2f6916c16.tar.xz samba-3f7bb704a9e62e7a46a05838ec9300c2f6916c16.zip |
r15837: starting sync up for 3.0.23rc1 (in sync with SAMBA_3_0 r15822)
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/RHEL/samba.spec.tmpl | 4 | ||||
-rw-r--r-- | packaging/RedHat-9/samba.spec.tmpl | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index 70501db7ae7..26d8a669367 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -27,7 +27,7 @@ Provides: samba = %{version} Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap2-devel, krb5-devel, cups-devel +BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel # Working around perl dependency problem from docs %define __perl_requires %{SOURCE998} @@ -112,7 +112,7 @@ cd source # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" ## check for ccache -ccache -h 2>&1 > /dev/null +# ccache -h 2>&1 > /dev/null #if [ $? -eq 0 ]; then # CC="ccache gcc" #else diff --git a/packaging/RedHat-9/samba.spec.tmpl b/packaging/RedHat-9/samba.spec.tmpl index 927f8f2b1ba..34e3d1e5161 100644 --- a/packaging/RedHat-9/samba.spec.tmpl +++ b/packaging/RedHat-9/samba.spec.tmpl @@ -449,6 +449,7 @@ fi %{prefix}/lib/libmsrpc.a %{prefix}/lib/libmsrpc.so %{prefix}/share/swat/help/* +%{prefix}/share/swat/using_samba/* %{prefix}/share/swat/include/*.html %{prefix}/share/swat/lang/*/help/* %config(noreplace) /etc/samba/lmhosts |