summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-01-25 05:27:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:06:14 -0500
commit0bd71d77cb24f4273cefffafbaee060f9308da20 (patch)
treefe85a2a225953a4e07480dd1b9d6984fc994aa12
parentc4307da13b98190b4185f7894d27686eca800af8 (diff)
downloadsamba-0bd71d77cb24f4273cefffafbaee060f9308da20.tar.gz
samba-0bd71d77cb24f4273cefffafbaee060f9308da20.tar.bz2
samba-0bd71d77cb24f4273cefffafbaee060f9308da20.zip
r13127: more spec file fixes for RHEL
(This used to be commit 8217809d86567fb4f8eb57a4d634b21c3a4c67e5)
-rw-r--r--packaging/RHEL/samba.spec.tmpl18
1 files changed, 8 insertions, 10 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 1a19e49560..9b2c3f3260 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -4,9 +4,9 @@
Summary: Samba SMB client and server
Vendor: Samba Team
Packager: Samba Team <samba@samba.org>
-Name: samba
-Version: PVERSION
-Release: PRELEASE
+Name: samba
+Version: PVERSION
+Release: PRELEASE
License: GNU GPL version 2
Group: System Environment/Daemons
URL: http://www.samba.org/
@@ -117,16 +117,14 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--with-swatdir=%{_datadir}/swat \
--enable-cups \
--with-acl-support \
- --with-ads \
--with-automount \
--with-fhs \
--with-pam_smbpass \
--with-libsmbclient \
--with-libsmbsharemodes \
- --without-smbwrapper \
--with-pam \
--with-quotas \
- --with-shared-modules=idmap_rid \
+ --with-shared-modules=idmap_rid,idmap_ad \
--with-smbmount \
--with-syslog \
--with-utmp
@@ -215,8 +213,8 @@ ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
# we need a symlink for mount to recognise the smb and smbfs filesystem types
-ln -sf %{_prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
-ln -sf %{_prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
+ln -sf %{_prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
+ln -sf %{_prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
# Install the miscellany
echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
@@ -404,12 +402,12 @@ fi
%{_libdir}/libsmbclient.a
%{_libdir}/libsmbclient.so
%{_libdir}/libsmbclient.so.0
-%{_prefix}/lib/*
%{_includedir}/libmsrpc.h
%{_libdir}/libmsrpc.a
%{_libdir}/libmsrpc.so
+%{_libdir}/libmsrpc.so.0
%{_libdir}/samba/charset/CP*.so
-%{_libdir}/samba/idmap/idmap*.so
+%{_libdir}/samba/idmap/*.so
%{_libdir}/samba/auth/script.so
%{_bindir}/testparm
%{_bindir}/smbpasswd