From 6d17664d9986f831be374198f01ca59ff750f938ee19c901fddc28bbf73d904a Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 17 Mar 2015 22:50:50 +0000 Subject: [PATCH 1/3] - Remove deprecated base_rid example from idmap_rid manpage; (bso#11169); (bnc#913304). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=455 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index fe01792..820ba0f 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1798fcdd83014716090c2f82c7d700861f09de303b8a1e04b51a1e479bc890eb -size 85973 +oid sha256:46725f6eb410a47f84d45d273205d83963218ad96e435a1ce6fb6026eb0920a0 +size 86354 diff --git a/samba.changes b/samba.changes index 7ede8fc..7ef78bf 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 17 15:21:58 UTC 2015 - ddiss@suse.com + +- Remove deprecated base_rid example from idmap_rid manpage; (bso#11169); + (bnc#913304). + ------------------------------------------------------------------- Thu Mar 5 10:35:21 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 3a69035..9fda626 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 3382 +%define SOURCE_TIMESTAMP 3384 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ec8a670..3b9856d 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:96ea3cf6b956264c5235e234e9ed0c2b3194c7b5fbf6f892a34889bf73ee2b3d -size 54713 +oid sha256:a41be2aa79c975071927318f947af6d13175d4d1dde32aeacec914fda371b0ca +size 54360 From 288a5aa7383ff48353f59bfce598bf8ba4da0a1ddda33ddabdedb11ce52f13e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 18 Mar 2015 18:15:46 +0000 Subject: [PATCH 2/3] - Simplify libxslt build requirement and README.SUSE install. - Remove no longer required cleanup steps while populating the build root. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=456 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 21 ++++----------------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 820ba0f..8191d88 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46725f6eb410a47f84d45d273205d83963218ad96e435a1ce6fb6026eb0920a0 -size 86354 +oid sha256:1f0ceb9c9583bba638d5f88e1c4354e80a5572049487fb435dd988c7c7e7be52 +size 86731 diff --git a/samba.changes b/samba.changes index 7ef78bf..70305de 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 18 17:57:50 UTC 2015 - lmuelle@suse.com + +- Simplify libxslt build requirement and README.SUSE install. +- Remove no longer required cleanup steps while populating the build root. + ------------------------------------------------------------------- Tue Mar 17 15:21:58 UTC 2015 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 9fda626..e0b98f7 100644 --- a/samba.spec +++ b/samba.spec @@ -110,12 +110,7 @@ BuildRequires: libtevent-devel BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets -%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1141 BuildRequires: libxslt -%endif -%if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211 -BuildRequires: libxslt1 -%endif %if 0%{?suse_version} > 1210 BuildRequires: dbus-1-devel BuildRequires: libxslt-tools @@ -148,7 +143,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3384 +%define SOURCE_TIMESTAMP 3385 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1090,10 +1085,6 @@ for patch in $( patches/tools/guards %{guards_symbols} "${file}.new" && \ - mv "${file}.new" "${file}" -done install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ # Create and add vendor suffix test -f vendor-files/tools/package-data && \ @@ -1373,8 +1364,8 @@ for file in ${LOGROTATE_FILES}; do touch "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}" echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file} done -install -m 0644 docu/README.vendor %{buildroot}/%{DOCDIR}/README.%{VENDOR} -# SuSEhelp files +install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/ +# SUSEhelp files install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop install -d -m 0755 -p ../docs/htmldocs install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html @@ -1401,12 +1392,8 @@ install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO mv COPYING README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/ -# this is empty -rm -rf docs/yodldocs -rm -rf docs/manpages cp -a docs/* %{buildroot}/%{DOCDIR} -rm -rf "%{buildroot}/%{DOCBOOKDIR}" -rm -f examples/VFS/*~ +rmdir "%{buildroot}/%{DOCBOOKDIR}" cp -a examples/ %{buildroot}/%{DOCDIR} # finally build filelist-samba-doc for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 3b9856d..0335cba 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:a41be2aa79c975071927318f947af6d13175d4d1dde32aeacec914fda371b0ca -size 54360 +oid sha256:7b1d2ab8eb1f4f3093985024b2fdc48aaa74f7a2e8683dca5a3c41508909df8d +size 54478 From 83dc4958f655d68ae200c524c438c8ce837180d03485394904ab3fbe9695af0c Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 20 Mar 2015 14:44:48 +0000 Subject: [PATCH 3/3] - Correctly retain errno from Btrfs snapshot ioctls; (bnc#923374). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=457 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 8191d88..5394501 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f0ceb9c9583bba638d5f88e1c4354e80a5572049487fb435dd988c7c7e7be52 -size 86731 +oid sha256:93c6f796612ee2fd3b5b8b6163e91711496e2142edfa5e77d22cbc631d8e2303 +size 86482 diff --git a/samba.changes b/samba.changes index 70305de..ec59e27 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 20 13:21:43 UTC 2015 - ddiss@suse.com + +- Correctly retain errno from Btrfs snapshot ioctls; (bnc#923374). + ------------------------------------------------------------------- Wed Mar 18 17:57:50 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index e0b98f7..6c1a840 100644 --- a/samba.spec +++ b/samba.spec @@ -143,7 +143,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3385 +%define SOURCE_TIMESTAMP 3386 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 0335cba..68daa3e 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:7b1d2ab8eb1f4f3093985024b2fdc48aaa74f7a2e8683dca5a3c41508909df8d -size 54478 +oid sha256:414d189b5f16218f53348bcf53df0faba665355ae7f1dde595176f3b6a840193 +size 53966