[SCM] Samba Shared Repository - branch v4-0-stable updated - release-4-0-0alpha5-2-gd665254

[Stefan Metzmacher]

The branch, v4-0-stable has been updated
       via  d6652540c2dda9091ccc6d05c3ebb24a663c9fac (commit)
       via  dc238848b3987a187212bd8088916c5b34755b0f (commit)
       via  6459adb6ac2bf94a1e60c1450dbef43360f30888 (commit)
       via  72aaa905b3a9c71578c362554b6ab75edd2cd695 (commit)
       via  0d9cc2d5333a0f8eb4f92b47a664f979f0ea6bdd (commit)
      from  74e95269fcded3454253452802f404d529508ce5 (commit)

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


- Log -----------------------------------------------------------------
commit d6652540c2dda9091ccc6d05c3ebb24a663c9fac
Merge: 74e95269fcded3454253452802f404d529508ce5 dc238848b3987a187212bd8088916c5b34755b0f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jul 2 15:33:20 2008 +0200

    Merge commit 'release-4-0-0alpha5' into v4-0-stable

commit dc238848b3987a187212bd8088916c5b34755b0f
Merge: 0d9cc2d5333a0f8eb4f92b47a664f979f0ea6bdd 6459adb6ac2bf94a1e60c1450dbef43360f30888
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 19:34:11 2008 +1000

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

commit 0d9cc2d5333a0f8eb4f92b47a664f979f0ea6bdd
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 14:08:03 2008 +1000

    Mark as alpha5 release

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

Summary of changes:
 packaging/Fedora/samba4.spec |   17 ++++++++++++++---
 source/Makefile              |    2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/Fedora/samba4.spec b/packaging/Fedora/samba4.spec
index 4e4de03..567d89b 100644
--- a/packaging/Fedora/samba4.spec
+++ b/packaging/Fedora/samba4.spec
@@ -160,7 +160,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 )
@@ -214,13 +218,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
@@ -268,7 +274,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
@@ -346,5 +353,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


-- 
Samba Shared Repository