pool/samba
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 491060 from home:dmdiss:samba_stable_git_migration_v2

Browse Source 
- Update to 4.6.3; (bsc#1036011)

- Generate and update vendor-files tarball from Git
  + SuSEfirewall2 service samba-client only setup IPv4 rule; (bsc#1034416).

OBS-URL: https://build.opensuse.org/request/show/491060
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=560
This commit is contained in:
Noel Power
2017-04-26 09:40:57 +00:00
committed by Git OBS Bridge
parent 3c207d7687
commit 3bd36433a1
7 changed files with 88 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samba.spec
View File

@@ -26,6 +26,7 @@
%define build_ceph 1
%endif
%endif
%define vendor_files_git_vers git.9d8643a
Name: samba
BuildRequires: autoconf
@@ -146,7 +147,7 @@ BuildRequires: librados-devel
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
Version: 4.6.2+git.19.c267455e57b
Version: 4.6.3+git.21.0735c828d4f
Release: 0
Url: https://www.samba.org/
Obsoletes: samba-gplv3 < %{version}
@@ -159,7 +160,7 @@ Summary: A SMB/CIFS File, Print, and Authentication Server
License: GPL-3.0+
Group: Productivity/Networking/Samba
Source: samba-%{version}.tar.bz2
Source1: vendor-files.tar.bz2
Source1: vendor-files-%{vendor_files_git_vers}.tar.bz2
Source4: baselibs.conf
Source100: samba-client-rpmlintrc
Requires: /usr/bin/getent
@@ -1042,7 +1043,7 @@ that RADOS locks can be used for CTDB split-brain avoidance.
%setup -n samba-%{version} -q
# vendor-files (config, scripts, tools)
%setup -T -D -a 1 -n samba-%{version} -q
install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/
install -m 0644 -p vendor-files-%{vendor_files_git_vers}/docu/rfc3454.txt source4/heimdal/lib/wind/
# Create and add vendor suffix
if test "%{_project}" != "openSUSE:Factory"; then
vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \
@@ -1198,9 +1199,9 @@ rm \
# CTDB
%if 0%{?suse_version}
install -m 0644 vendor-files/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
%else
install -m 0644 vendor-files/config/sysconfig.ctdb ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
install -m 0644 vendor-files-%{vendor_files_git_vers}/config/sysconfig.ctdb ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
%endif
%if 0%{?suse_version} > 1220
install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
@@ -1227,7 +1228,7 @@ for i in $scripts; do
install -m 0755 "source3/script/${i}" examples/scripts/${i}
done
# configuration files
pushd vendor-files
pushd vendor-files-%{vendor_files_git_vers}
echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf
echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.conf
echo "# samba-doc package is installed." >>config/smb.conf