[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-173-gbb6e0ee

Mon Jun 30 11:55:13 GMT 2008

The branch, v4-0-test has been updated
       via  bb6e0ee953dfc59d0e04f9ea2daf051f6a6ff837 (commit)
       via  97b7a521da183b63c494b395d330f70d5cd4e233 (commit)
       via  857df6e91874407f70436749e3dad13ada003e6e (commit)
       via  6459adb6ac2bf94a1e60c1450dbef43360f30888 (commit)
       via  72aaa905b3a9c71578c362554b6ab75edd2cd695 (commit)
       via  74e95269fcded3454253452802f404d529508ce5 (commit)
       via  333bd6a219d7c3f3dc0d2fe2034cf13255e8c148 (commit)
       via  757acb6802cfb0e98e91e6062c62b6c5a852302b (commit)
       via  23494a91de6d1c36a5db0d622f707f2c15b3f549 (commit)
      from  861b79c91fb39b6b7f40d57000770f0f839e6c59 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit bb6e0ee953dfc59d0e04f9ea2daf051f6a6ff837
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 21:54:43 2008 +1000

    A couple more package updates

commit 97b7a521da183b63c494b395d330f70d5cd4e233
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 21:54:28 2008 +1000

    On the way to alpha6!

commit 857df6e91874407f70436749e3dad13ada003e6e
Merge: 6459adb6ac2bf94a1e60c1450dbef43360f30888 74e95269fcded3454253452802f404d529508ce5
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 21:54:01 2008 +1000

    Merge branch '4-0-stable' into 4-0-local

commit 6459adb6ac2bf94a1e60c1450dbef43360f30888
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 19:34:02 2008 +1000

    More updates for spec file, for alpha5

commit 72aaa905b3a9c71578c362554b6ab75edd2cd695
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 19:31:20 2008 +1000

    Ensure we install smbd as well...

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt                 |    4 ++--
 packaging/Fedora/samba4.spec |   27 +++++++++++++++++++--------
 source/Makefile              |    2 +-
 source/VERSION               |    2 +-
 4 files changed, 23 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 562a331..726fb1c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -69,7 +69,7 @@ In the time since Samba4 Alpha4 was released in June 2008, Samba has
 continued to evolve, but you may particularly notice these areas:
 
   LDAP backend support restored (issues preventing the use of the LDAP
-  backend in alpha4 have been addressed)
+  backend in alpha4 have been addressed).
 
   SMB2 Support:  The SMB2 server, while still disabled, has improved,
   and now supports SMB2 signing. 
@@ -107,7 +107,7 @@ KNOWN ISSUES
 
 - There is no printing support in the current release.
 
-- There is no netbios browsing support in the current release
+- There is no NetBIOS browsing support in the current release
 
 - The Samba4 port of the CTDB clustering support is not yet complete
 
diff --git a/packaging/Fedora/samba4.spec b/packaging/Fedora/samba4.spec
index 58af948..4e86050 100644
--- a/packaging/Fedora/samba4.spec
+++ b/packaging/Fedora/samba4.spec
@@ -1,5 +1,5 @@
-%define main_release 1
-%define alpha_version 4
+%define main_release 2
+%define alpha_version 5
 %define samba_version 4.0.0alpha%{alpha_version}
 %define tarball_name samba-4.0.0alpha%{alpha_version}
 
@@ -61,6 +61,8 @@ Summary: Samba libraries
 Group: Applications/System
 Requires: libtdb >= 0:%{tdb_version}
 Requires: libtalloc >= 0:%{talloc_version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description libs
 The %{name}-libs package  contains the libraries needed by programs 
@@ -76,7 +78,7 @@ The %{name}-python package contains the python libraries needed by programs
 that use SMB, RPC and other Samba provided protocols in python programs/
 
 %package devel
-Summary: Developor tools for Samba libraries
+Summary: Developer tools for Samba libraries
 Group: Development/Libraries
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
@@ -122,8 +124,6 @@ domains and to use Windows user and group accounts on Linux.
 #%setup -q
 
 # copy Red Hat specific scripts
-mkdir packaging/Fedora
-cp %{SOURCE5} packaging/Fedora/
 
 # Upstream patches
 #(none)
@@ -162,7 +162,11 @@ rm -rf $RPM_BUILD_ROOT
 cd source
 
 #Don't call 'make install' as we want to call out to the PIDL install manually 
-make installbin installdat installswat installmisc installlib installheader installpc installplugins installpython DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Undo the PIDL install, we want to try again with the right options
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/perl5
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/perl5
 
 #Install PIDL
 ( cd pidl && make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT )
@@ -216,13 +220,15 @@ rm $RPM_BUILD_ROOT/%{_bindir}/setnttoken
 rm $RPM_BUILD_ROOT/%{_bindir}/getntacl
 rm $RPM_BUILD_ROOT/%{_datadir}/samba/js/base.js
 
+#This makes the right links, as rpmlint requires that the
+#ldconfig-created links be recorded in the RPM.
 /sbin/ldconfig -N -n $RPM_BUILD_ROOT/%{_libdir}
 
 #Fix up permission on perl install
 %{_fixperms} $RPM_BUILD_ROOT/%{perl_vendorlib}
 
 #Fix up permissions in source tree, for debuginfo
-find -type f | xargs chmod -x
+find source/heimdal -type f | xargs chmod -x
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -270,7 +276,8 @@ exit 0
 %dir %{_datadir}/samba
 %{_datadir}/samba/*.dat
 %{_libdir}/*.so.*
-%{_libdir}/samba
+#Only needed if Samba's build produces plugins
+#%{_libdir}/samba
 %dir %{_sysconfdir}/%{name}
 #Need to mark this as being owned by Samba, but it is normally created
 #by the provision script, which runs best if there is no existing
@@ -348,5 +355,9 @@ exit 0
 %doc WHATSNEW.txt
 
 %changelog
+* Mon Jun 30 2008 Andrew Bartlett <abartlet at samba.org> - 0:4.0.0-0.2.alpha5.fc9
+- Update per review feedback
+- Update for alpha5
+
 * Thu Jun 26 2008 Andrew Bartlett <abartlet at samba.org> - 0:4.0.0-0.1.alpha4.fc9
 - Rework Fedora's Samba 3.2.0-1.rc2.16 spec file for Samba4
diff --git a/source/Makefile b/source/Makefile
index e43ccf7..93c6f45 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -178,7 +178,7 @@ showflags::
 # The permissions to give the executables
 INSTALLPERMS = 0755
 
-install:: showlayout everything installbin installdat installswat installmisc \
+install:: showlayout everything installbin installsbin installdat installswat installmisc \
 	      installlib installheader installpc installplugins
 
 # DESTDIR is used here to prevent packagers wasting their time
diff --git a/source/VERSION b/source/VERSION
index 7a526c6..2720864 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE=
 # e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
 #  ->  "4.0.0alpha1"                                   #
 ########################################################
-SAMBA_VERSION_ALPHA_RELEASE=5
+SAMBA_VERSION_ALPHA_RELEASE=6
 
 ########################################################
 # For 'pre' releases the version will be               #


-- 
Samba Shared Repository
