[samba] Update to Samba 4.1.0.

asn asn at fedoraproject.org
Fri Oct 11 14:19:28 UTC 2013


commit 67c18d3e8d2bc071916242d6225e5c9c50647f3a
Author: Andreas Schneider <asn at redhat.com>
Date:   Fri Oct 11 16:18:46 2013 +0200

    Update to Samba 4.1.0.
    
    related: #985609

 .gitignore                                        |    1 +
 samba-4.1.0rc4-add_support_for_krb5_keyring.patch |  122 ---------------------
 samba.spec                                        |   11 +-
 sources                                           |    2 +-
 4 files changed, 7 insertions(+), 129 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e31560..16a3f14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ samba-3.6.0pre1.tar.gz
 /samba-4.1.0rc2.tar.xz
 /samba-4.1.0rc3.tar.xz
 /samba-4.1.0rc4.tar.xz
+/samba-4.1.0.tar.xz
diff --git a/samba.spec b/samba.spec
index e2db88e..328f529 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,7 +1,7 @@
 # Set --with testsuite or %bcond_without to run the Samba torture testsuite.
 %bcond_with testsuite
 
-%define main_release 8
+%define main_release 1
 
 %define samba_version 4.1.0
 %define talloc_version 2.0.8
@@ -10,7 +10,7 @@
 %define tevent_version 0.9.18
 %define ldb_version 1.1.16
 # This should be rc1 or nil
-%define pre_release rc4
+%define pre_release %nil
 
 %if "x%{?pre_release}" != "x"
 %define samba_release 0.%{main_release}.%{pre_release}%{?dist}
@@ -77,8 +77,6 @@ Source6: samba.pamd
 Source200: README.dc
 Source201: README.downgrade
 
-Patch0: samba-4.1.0rc4-add_support_for_krb5_keyring.patch
-
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(pre): /usr/sbin/groupadd
@@ -449,8 +447,6 @@ module necessary to communicate to the Winbind Daemon
 %prep
 %setup -q -n samba-%{version}%{pre_release}
 
-%patch0 -p1 -b .samba-4.1.0rc4-add_support_for_krb5_keyring.patch
-
 %build
 %global _talloc_lib ,talloc,pytalloc,pytalloc-util
 %global _tevent_lib ,tevent,pytevent
@@ -1492,6 +1488,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/pam_winbind.8*
 
 %changelog
+* Fri Oct 11 2013 - Andreas Schneider <asn at redhat.com> - 4.1.0-1
+- related: #985609 - Update to Samba 4.1.0.
+
 * Tue Oct 01 2013 - Andreas Schneider <asn at redhat.com> - 2:4.1.0-0.8
 - related: #985609 - Update to Samba 4.1.0rc4.
 - resolves: #1010722 - Split out a samba-winbind-modules package.
diff --git a/sources b/sources
index 7c57abe..be0303a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f956690eda1243ab2b7d54bd1fded747  samba-4.1.0rc4.tar.xz
+0414c344cc0cf68f4fa37d241a6fa004  samba-4.1.0.tar.xz


More information about the scm-commits mailing list