[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-3-68-g627832e
Karolin Seeger
kseeger at samba.org
Wed Sep 10 10:13:24 GMT 2008
The branch, v3-2-stable has been updated
via 627832e5f7ed6c82c227a55a9fdcc5bff25242ff (commit)
via 31491407ba7e645a07a619664c1c751671b28b30 (commit)
via 90a50d9c2a442c492682050e00d6619a4717f6f8 (commit)
via 5e1994c92ef4f6a068c8465d176de20d3c10e0e6 (commit)
via c58733fc96ccaadb7ad95c1bbc97ac75f57cf46a (commit)
via 33aeca1b59cda1f02a04e721f8ad1e6c6595d199 (commit)
via f41775617814ccc30131f69ea4538109e9b354dd (commit)
via 515be63fb624e82618993fe4478df93259020408 (commit)
from 47a9726c47eca22f4389794536827e5824f2ae90 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 627832e5f7ed6c82c227a55a9fdcc5bff25242ff
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Sep 10 12:11:05 2008 +0200
WHATSNEW: Update changes since 3.2.3.
Karolin
(cherry picked from commit df138f23b920757076917553fa4bbbe413918cf7)
commit 31491407ba7e645a07a619664c1c751671b28b30
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:44:06 2008 +0200
packaging(RHEL): remove duplicate installation of pam_smbpass.so
Michael
(cherry picked from commit cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22)
(cherry picked from commit 5359d8ae840dba48bb6f2163085d22b80108db2c)
commit 90a50d9c2a442c492682050e00d6619a4717f6f8
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 17:38:55 2008 +0200
packaging(RHEL): use ccache if available
Michael
(cherry picked from commit e8abbfabde3da0844ffb4e2507084c139a70d503)
(cherry picked from commit 998b699f27630d3ea6d781da4f09c1cfd3e24511)
commit 5e1994c92ef4f6a068c8465d176de20d3c10e0e6
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 15:52:27 2008 +0200
packaging(RHEL): add ldbtools binaries and man pages to common package
Michael
(cherry picked from commit 206985dfda5a9f62df975629046b00a88ec666f5)
(cherry picked from commit 80d5e3621cac803c007e38e437d07f7dab2379aa)
commit c58733fc96ccaadb7ad95c1bbc97ac75f57cf46a
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 14:46:31 2008 +0200
packaging(RHEL): remove leftovers of smbmount from SPEC file.
Michael
(cherry picked from commit 041875c64daba3d185b1954eb0eb9a21b2f41ee1)
(cherry picked from commit 17351dc1ea2be1d2478d6ae00d63ec8967539ab0)
commit 33aeca1b59cda1f02a04e721f8ad1e6c6595d199
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 17:45:45 2008 +0200
packaging(RHEL): add new libs (talloc, tdb, ...) to the common package
Michael
(cherry picked from commit f23183bbec55faf2d6496e04e73f8dd415a08d1c)
(cherry picked from commit 84810cd8a66503acb447e7c3bd439b76c735366b)
commit f41775617814ccc30131f69ea4538109e9b354dd
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:41:30 2008 +0200
packaging(RHEL): remove smbmount related stuff from spec file
Michael
(cherry picked from commit 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8)
(cherry picked from commit fdaef16604064cbd0be75838f9d6359a3d7a8e1b)
commit 515be63fb624e82618993fe4478df93259020408
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 15:45:18 2008 +0200
packaging(RHEL): fix version of GPL (2 --> 3)
Michael
(cherry picked from commit c015e8e0cf4131f21305451943df13b81f51ea6a)
(cherry picked from commit e243a6a724fc820fa01aa3e16f18212ed6729415)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 1 +
packaging/RHEL/samba.spec.tmpl | 54 ++++++++++++++++++++++-----------------
2 files changed, 31 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index ce223c9..c1eb68f 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -23,6 +23,7 @@ Changes since 3.2.3
o Michael Adam <obnox at samba.org>
* BUG 5590: Fix binary stripping on older OS.
* BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
+ * BUG 5507: Fix several issues in the RHEL SPEC file.
* Fix linking of cifs.upcall when nscd_flush_cache() is found.
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index c4d4fd6..8c34a4a 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -8,7 +8,7 @@ Name: samba
Version: PVERSION
Release: PRELEASEPRPMREV
Epoch: 0
-License: GNU GPL version 2
+License: GNU GPL version 3
Group: System Environment/Daemons
URL: http://www.samba.org/
@@ -113,17 +113,17 @@ cd source
# RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
## check for ccache
-# ccache -h 2>&1 > /dev/null
-#if [ $? -eq 0 ]; then
-# CC="ccache gcc"
-#else
+ ccache -h 2>&1 > /dev/null
+if [ $? -eq 0 ]; then
+ CC="ccache gcc"
+else
CC="gcc"
-#fi
+fi
## always run autogen.sh
./autogen.sh
-CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
+CC="$CC" CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--prefix=%{_prefix} \
--localstatedir=/var \
--with-configdir=%{_sysconfdir}/samba \
@@ -147,7 +147,6 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--with-pam \
--with-quotas \
--with-shared-modules=idmap_rid,idmap_ad \
- --with-smbmount \
--with-syslog \
--with-utmp \
--with-dnsupdate
@@ -208,9 +207,6 @@ make DESTDIR=$RPM_BUILD_ROOT \
install
cd ..
-# pam_smbpass
-cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
-
# NSS & PAM winbind support
install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
@@ -240,11 +236,6 @@ install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smb
## cleanup
/bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
-# we need a symlink for mount to recognise the smb and smbfs filesystem types
-ln -sf %{_prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
-ln -sf %{_prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
-/bin/rm -f $RPM_BUILD_ROOT/mount.smbfs
-
# Install the miscellany
echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
@@ -415,16 +406,11 @@ fi
%files client
%defattr(-,root,root)
-/sbin/mount.smb
-/sbin/mount.smbfs
/sbin/mount.cifs
/sbin/umount.cifs
%{_bindir}/rpcclient
%{_bindir}/smbcacls
-%{_bindir}/smbmount
-%{_bindir}/smbmnt
-%{_bindir}/smbumount
%{_bindir}/findsmb
%{_bindir}/smbcquotas
%{_bindir}/nmblookup
@@ -436,9 +422,6 @@ fi
%{_bindir}/net
%{_bindir}/smbtree
-%{_mandir}/man8/smbmnt.8*
-%{_mandir}/man8/smbmount.8*
-%{_mandir}/man8/smbumount.8*
%{_mandir}/man8/mount.cifs.8.*
%{_mandir}/man8/umount.cifs.8.*
%{_mandir}/man8/smbspool.8*
@@ -459,6 +442,8 @@ fi
%files common
%defattr(-,root,root)
%dir %{_sysconfdir}/samba
+%dir %{_libarchdir}/samba
+%dir %{_libarchdir}/samba/charset
%config(noreplace) %{_sysconfdir}/samba/smb.conf
%config(noreplace) %{_sysconfdir}/samba/lmhosts
@@ -476,10 +461,25 @@ fi
%{_libdir}/samba/*.msg
%{_libdir}/samba/charset/*.so
+%{_includedir}/netapi.h
+%{_includedir}/wbclient.h
+%{_includedir}/talloc.h
+%{_includedir}/tdb.h
+%{_libarchdir}/libnetapi.so*
+%{_libarchdir}/libtalloc.so*
+%{_libarchdir}/libtdb.so*
+%{_libarchdir}/libwbclient.so*
+
%{_bindir}/testparm
%{_bindir}/smbpasswd
%{_bindir}/profiles
+%{_bindir}/ldbadd
+%{_bindir}/ldbdel
+%{_bindir}/ldbedit
+%{_bindir}/ldbmodify
+%{_bindir}/ldbsearch
+
%{_mandir}/man1/profiles.1*
%{_mandir}/man1/testparm.1*
%{_mandir}/man5/smb.conf.5*
@@ -488,6 +488,12 @@ fi
%{_mandir}/man7/libsmbclient.7*
%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man1/ldbadd.1*
+%{_mandir}/man1/ldbdel.1*
+%{_mandir}/man1/ldbedit.1*
+%{_mandir}/man1/ldbmodify.1*
+%{_mandir}/man1/ldbsearch.1*
+
%changelog
* Fri Jan 16 2004 Gerald (Jerry) Carter <jerry at samba,org>
- Removed ChangeLog entries since they are kept in CVS
--
Samba Shared Repository
More information about the samba-cvs
mailing list