[samba4/f16] Add missing patch and fix release string

[Simo Sorce]

commit 199db23ee366a33c1d4a94c5950a5dcb48faeade
Author: Simo Sorce <ssorce at redhat.com>
Date:   Wed Aug 3 17:35:26 2011 -0400

    Add missing patch and fix release string

 samba-4.0.0alpha16.buildfix.patch |   24 ++++++++++++++++++++++++
 samba4.spec                       |    2 +-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/samba-4.0.0alpha16.buildfix.patch b/samba-4.0.0alpha16.buildfix.patch
new file mode 100644
index 0000000..9802628
--- /dev/null
+++ b/samba-4.0.0alpha16.buildfix.patch
@@ -0,0 +1,24 @@
+diff -uPr samba-4.0.0alpha16/dynconfig/wscript samba-4.0.0alpha16.buildfix/dynconfig/wscript
+--- samba-4.0.0alpha16/dynconfig/wscript	2011-06-24 02:27:55.000000000 -0400
++++ samba-4.0.0alpha16.buildfix/dynconfig/wscript	2011-08-02 17:49:53.918594580 -0400
+@@ -37,7 +37,7 @@
+     'NCALRPCDIR'                     : '${SOCKETS_DIR}/ncalrpc',
+     'PYTHONDIR'                      : '${PYTHONDIR}',
+     'PYTHONARCHDIR'                  : '${PYTHONARCHDIR}',
+-    'MODULESDIR'                     : '${PREFIX}/modules',
++    'MODULESDIR'                     : '${MODULESDIR}',
+     'INCLUDEDIR'                     : '${PREFIX}/include',
+     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
+     'SWATDIR'                        : '${DATADIR}/swat',
+diff -uPr samba-4.0.0alpha16/dynconfig/wscript samba-4.0.0alpha16.buildfix/dynconfig/wscript
+--- samba-4.0.0alpha16/dynconfig/wscript	2011-08-03 10:22:53.949115202 -0400
++++ samba-4.0.0alpha16.buildfix/dynconfig/wscript	2011-08-03 10:23:23.637563597 -0400
+@@ -38,7 +38,7 @@
+     'PYTHONDIR'                      : '${PYTHONDIR}',
+     'PYTHONARCHDIR'                  : '${PYTHONARCHDIR}',
+     'MODULESDIR'                     : '${MODULESDIR}',
+-    'INCLUDEDIR'                     : '${PREFIX}/include',
++    'INCLUDEDIR'                     : '${PREFIX}/include/samba-4.0',
+     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
+     'SWATDIR'                        : '${DATADIR}/swat',
+     'CODEPAGEDIR'                    : '${DATADIR}/codepages',
diff --git a/samba4.spec b/samba4.spec
index 73c95c9..15ad62e 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -10,7 +10,7 @@
 
 %define tarball_name samba-%{samba4_version}%{pre_release}
 
-%define samba4_release %{main_release}.%{pre_release}%{?dist}
+%define samba4_release %{main_release}%{pre_release}%{?dist}
 
 # Most of these subpackages are disabled because they are not
 # needed by OpenChange, and to avoid file conflicts with Samba3.