[samba4] Add upstream patch for --disable-silent-rules.

Matthew Barnes mbarnes at fedoraproject.org
Wed Jan 25 22:28:06 UTC 2012


commit 6a23180456c956beda7e4ca13817bb879afe5f18
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Wed Jan 25 17:26:47 2012 -0500

    Add upstream patch for --disable-silent-rules.

 samba-4.0.0alpha16-another-buildfix.patch |   13 +++++++++++++
 samba4.spec                               |   12 ++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/samba-4.0.0alpha16-another-buildfix.patch b/samba-4.0.0alpha16-another-buildfix.patch
new file mode 100644
index 0000000..7e3bede
--- /dev/null
+++ b/samba-4.0.0alpha16-another-buildfix.patch
@@ -0,0 +1,13 @@
+diff -up samba-4.0.0alpha16/buildtools/wafsamba/wscript.another-buildfix samba-4.0.0alpha16/buildtools/wafsamba/wscript
+--- samba-4.0.0alpha16/buildtools/wafsamba/wscript.another-buildfix	2011-02-22 02:01:00.000000000 -0500
++++ samba-4.0.0alpha16/buildtools/wafsamba/wscript	2012-01-25 17:02:57.062809451 -0500
+@@ -158,6 +158,9 @@ def set_options(opt):
+     opt.add_option('--disable-dependency-tracking',
+ 		   help=SUPPRESS_HELP,
+ 		   action='store_true', dest='AUTOCONF_DISABLE_DEPENDENCY_TRACKING', default=False)
++    opt.add_option('--disable-silent-rules',
++		   help=SUPPRESS_HELP,
++		   action='store_true', dest='AUTOCONF_DISABLE_SILENT_RULES', default=False)
+ 
+     gr = opt.option_group('dist options')
+     gr.add_option('--sign-release',
diff --git a/samba4.spec b/samba4.spec
index ec193ec..312e233 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 37
+%define main_release 38
 %define samba4_version 4.0.0
 
 %define talloc_version 2.0.5
@@ -29,7 +29,7 @@
 
 Name: samba4
 Version: %{samba4_version}
-Release: %{samba4_release}%{?dist}.1
+Release: %{samba4_release}%{?dist}
 Group: System Environment/Daemons
 Summary: The Samba4 CIFS and AD client and server suite
 License: GPLv3+ and LGPLv3+
@@ -45,7 +45,8 @@ Source5: %{name}.init
 %endif
 
 Patch01: samba-4.0.0alpha16.buildfix.patch
-Patch02: samba-4.0.0alpha16-ignore-disable-silent-rules.patch
+
+Patch02: samba-4.0.0alpha16-another-buildfix.patch
 
 Requires(pre): /usr/sbin/groupadd
 
@@ -175,7 +176,7 @@ domains and to use Windows user and group accounts on Linux.
 
 # copy Red Hat specific scripts
 %patch01 -p1 -b .buildfix
-%patch02 -p1 -b .ignore-disable-silent-rules
+%patch02 -p1 -b .another-buildfix
 
 %build
 %configure \
@@ -843,6 +844,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Jan 25 2012 Matthew Barnes <mbarnes at redhat.com> - 4.0.0-38.alpha16
+- Add another "buildfix" patch for --disable-silent-rules.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-37.alpha16.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list