From 9a6fad02f0ea921c275c75f5cc6cd2625e8ae77e62a4c2e61283047deb0d3f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 7 Jul 2014 14:15:20 +0000 Subject: [PATCH 1/3] BuildRequire systemd-devel and configure --with-systemd on post-12.2 systems; (bnc#865627). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=418 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 6 +++++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d194a6a..9499d51 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78b1326aaf76f0bd983f7a6bbafe62549515d22f3418f8f60af818d8b40e6f4c -size 277716 +oid sha256:3c968614808fbd9e56ef0904b0f3c3aa1f69b176e6f90d35d9ad84db214e7251 +size 278614 diff --git a/samba.changes b/samba.changes index a45248b..d1e5108 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 7 13:59:24 UTC 2014 - lmuelle@suse.com + +- BuildRequire systemd-devel and configure --with-systemd on post-12.2 + systems; (bnc#865627). + ------------------------------------------------------------------- Wed Jun 25 11:52:17 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index ec6510d..0ab7ccb 100644 --- a/samba.spec +++ b/samba.spec @@ -119,6 +119,7 @@ BuildRequires: libxslt-tools %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline BuildRequires: systemd +BuildRequires: systemd-devel %endif %define samba_ver 4.1.9 %define samba_ver_suffix %nil @@ -147,7 +148,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3258 +%define SOURCE_TIMESTAMP 3259 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1206,6 +1207,9 @@ CONFIGURE_OPTIONS="\ --with-privatedir=%{CONFIGDIR} \ --with-quotas \ --with-syslog \ +%if 0%{?suse_version} > 1220 + --with-systemd \ +%endif --with-utmp \ --with-winbind \ --with-shared-modules=%{auth_modules},%{vfs_modules},%{pdb_modules},%{idmap_modules} \ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c7fb8ee..fbee64a 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0382e8fcb71d00cdd2fa19f0708ad1cf6ed467f4c0a1ecab2f89d164979cfad8 -size 54607 +oid sha256:874713d4dc6263a3530af8d906639d38cc1750f5a1ab29614cee00e8f8860fea +size 54454 From 50bc1040b46ce8d0197ed43ac76f5a0f9c0e9eed853535b9176021dd8bade40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 7 Jul 2014 14:27:59 +0000 Subject: [PATCH 2/3] Add bso#10517 along with bnc#865627 too. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=419 --- patches.tar.bz2 | 4 ++-- samba.changes | 2 +- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 9499d51..b9ca51d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c968614808fbd9e56ef0904b0f3c3aa1f69b176e6f90d35d9ad84db214e7251 -size 278614 +oid sha256:3287367444fa3de51ad581307ccb9485ba1b514a3be779b1a06dfec658f0f493 +size 278777 diff --git a/samba.changes b/samba.changes index d1e5108..070cb09 100644 --- a/samba.changes +++ b/samba.changes @@ -2,7 +2,7 @@ Mon Jul 7 13:59:24 UTC 2014 - lmuelle@suse.com - BuildRequire systemd-devel and configure --with-systemd on post-12.2 - systems; (bnc#865627). + systems; (bso#10517); (bnc#865627). ------------------------------------------------------------------- Wed Jun 25 11:52:17 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 0ab7ccb..ca67c6e 100644 --- a/samba.spec +++ b/samba.spec @@ -148,7 +148,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3259 +%define SOURCE_TIMESTAMP 3260 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index fbee64a..dc27f68 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:874713d4dc6263a3530af8d906639d38cc1750f5a1ab29614cee00e8f8860fea -size 54454 +oid sha256:d90aa2933164b9d2ed21267a25aa28abc7153a66ac4a1af09c06236268595622 +size 54637 From 8a82019dfcc8c137dad0cbf01607a94a7b74017c134a907ebf1a50c0f6e4a10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 7 Jul 2014 14:56:12 +0000 Subject: [PATCH 3/3] Mention the modified service files too. BuildRequire systemd-devel, configure --with-systemd, and modify the service files accordingly on post-12.2 systems; (bso#10517); (bnc#865627). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=420 --- patches.tar.bz2 | 4 ++-- samba.changes | 4 ++-- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b9ca51d..f8b9e51 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3287367444fa3de51ad581307ccb9485ba1b514a3be779b1a06dfec658f0f493 -size 278777 +oid sha256:fab9c5eb2f35cc9e16956cb4c61c028ea7348174fea958a8d2a7fcea7740f16f +size 279000 diff --git a/samba.changes b/samba.changes index 070cb09..d6824a9 100644 --- a/samba.changes +++ b/samba.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Mon Jul 7 13:59:24 UTC 2014 - lmuelle@suse.com -- BuildRequire systemd-devel and configure --with-systemd on post-12.2 - systems; (bso#10517); (bnc#865627). +- BuildRequire systemd-devel, configure --with-systemd, and modify the service + files accordingly on post-12.2 systems; (bso#10517); (bnc#865627). ------------------------------------------------------------------- Wed Jun 25 11:52:17 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index ca67c6e..150709f 100644 --- a/samba.spec +++ b/samba.spec @@ -148,7 +148,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3260 +%define SOURCE_TIMESTAMP 3261 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index dc27f68..f4d4791 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d90aa2933164b9d2ed21267a25aa28abc7153a66ac4a1af09c06236268595622 -size 54637 +oid sha256:68b28e6656da39f994f07ea093ece8ec4969275d93f9b394c37aedf25e28237a +size 54738