From db36721221857c75c95ae6b5a2dc7cbe2423f42df8fb39132e5fade4bdd0ff3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 19 Sep 2015 15:14:24 +0000 Subject: [PATCH 1/9] Add bso 11515 to bnc 945502 This change must not be mregd into pre-4.3 branches OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=497 --- 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 37f0942..d0c549c 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f41b1ca9ba6ac11db93bf35ee0be2b4951c6ab3828d6177c48c091d672134eb6 -size 29304 +oid sha256:3642be5ce0cf70ea73bf6e126c62a3bd73dc16ab552ff59e0cca50de1db17bdb +size 29288 diff --git a/samba.changes b/samba.changes index e61e0a7..b2e2aeb 100644 --- a/samba.changes +++ b/samba.changes @@ -6,7 +6,7 @@ Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com ------------------------------------------------------------------- Fri Sep 11 15:53:45 UTC 2015 - lmuelle@suse.com -- Package /var/lib/samba/msg with 0755 permissions; (bnc#945502). +- Package /var/lib/samba/msg with 0755 permissions; (bso#11515); (bnc#945502). ------------------------------------------------------------------- Wed Sep 9 10:57:52 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 1b16c94..f7dc807 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3485 +%define SOURCE_TIMESTAMP 3487 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index dc79b66..1c83474 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:a80b6dfa1b959e07fabaf9cbe58450211ebed1bca0f181b05d5ad4ecaabbeb25 -size 52898 +oid sha256:926178c7362c5c0c0688a6a829d82be5111576875f65a066520777bd0ba10e17 +size 52947 From bc10e362f1848003c341871471cd6eec233b7dc8f2ca839028d5f5f0ea31ed77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 22 Sep 2015 17:42:44 +0000 Subject: [PATCH 2/9] Do not provide libpdb0 from libsamba-passdb0 but add it to baselibs.conf instead; (bnc#942716). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=498 --- baselibs.conf | 1 + patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 3 +-- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 1a56bdf..7808972 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -12,6 +12,7 @@ libregistry0 libsamba-credentials0 libsamba-hostconfig0 libsamba-passdb0 + obsoletes "libpdb0- < " libsamba-policy0 libsamba-util0 libsamdb0 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d0c549c..24bffb7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3642be5ce0cf70ea73bf6e126c62a3bd73dc16ab552ff59e0cca50de1db17bdb -size 29288 +oid sha256:468f074b32e91957209e900e37bedf88f81bd4a7c7b8dd2ed4df37f7b31f4d04 +size 29300 diff --git a/samba.changes b/samba.changes index b2e2aeb..f3773ad 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com + +- Do not provide libpdb0 from libsamba-passdb0 but add it to baselibs.conf + instead; (bnc#942716). + ------------------------------------------------------------------- Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index f7dc807..6540342 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3487 +%define SOURCE_TIMESTAMP 3489 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -765,7 +765,6 @@ Branch: %{BRANCH} Summary: Samba3 password database library License: GPL-3.0+ Group: System/Libraries -Provides: libpdb0 Obsoletes: libpdb0 %description -n libsamba-passdb0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1c83474..d1ae496 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:926178c7362c5c0c0688a6a829d82be5111576875f65a066520777bd0ba10e17 -size 52947 +oid sha256:aa4c986d1f9138d58aa4da6a0fcb0a94367b8170152136e96b4e42058e64d8d8 +size 52914 From ff3dd43321f7148fab52f3c2bf3ec727ef9f2104ad527f1dd6249329a396510e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 22 Sep 2015 22:58:38 +0000 Subject: [PATCH 3/9] Obsolte libpdb0 < %version This fits the baselibs.conf obsoletes OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=499 --- patches.tar.bz2 | 4 ++-- samba.spec | 4 ++-- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 24bffb7..f3be5a5 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:468f074b32e91957209e900e37bedf88f81bd4a7c7b8dd2ed4df37f7b31f4d04 -size 29300 +oid sha256:b5b8d6962ed807f9fb932ed70063bcef81bc4edae8f9bddd11e6bdf3f9c4f03e +size 29274 diff --git a/samba.spec b/samba.spec index 6540342..d740748 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3489 +%define SOURCE_TIMESTAMP 3490 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -765,7 +765,7 @@ Branch: %{BRANCH} Summary: Samba3 password database library License: GPL-3.0+ Group: System/Libraries -Obsoletes: libpdb0 +Obsoletes: libpdb0 < %{version} %description -n libsamba-passdb0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index d1ae496..3d91612 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:aa4c986d1f9138d58aa4da6a0fcb0a94367b8170152136e96b4e42058e64d8d8 -size 52914 +oid sha256:7ce801dae444ddf8c66358801678e1e460465a86836bad03c1e786fe68359e38 +size 52858 From f50d1b53d2f4d182403373c67b03b37767f4d9517ff6eadfccdfa4327ddfd484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 25 Sep 2015 13:42:08 +0000 Subject: [PATCH 4/9] Add missing sysconfig file header; (bnc#947361). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=500 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 18 ++++++++++++------ vendor-files.tar.bz2 | 4 ++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index f3be5a5..d591063 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5b8d6962ed807f9fb932ed70063bcef81bc4edae8f9bddd11e6bdf3f9c4f03e -size 29274 +oid sha256:c72a9314d0ceab45dfac826730e748f724c13a51be4f100a5ed2b2f9539b688e +size 29279 diff --git a/samba.changes b/samba.changes index f3773ad..f3a50cb 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 25 11:58:02 UTC 2015 - lmuelle@suse.com + +- Add missing sysconfig file header; (bnc#947361). + ------------------------------------------------------------------- Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index d740748..f079d53 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3490 +%define SOURCE_TIMESTAMP 3492 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -153,7 +153,6 @@ Release: 0 Url: http://www.samba.org/ Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} -Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron Recommends: logrotate @@ -175,6 +174,7 @@ PreReq: grep %if 0%{?suse_version} > 1220 PreReq: %{fillup_prereq} %endif +PreReq: samba-client >= %{version} # Choose some features / extra packages here ############################################ %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 @@ -420,7 +420,6 @@ Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd Requires: %{libwbclient_name} = %{version}-%{release} -Requires: samba-client >= %{version} %if 0%{?suse_version} Requires: pam-config %endif @@ -435,6 +434,8 @@ PreReq: %{?insserv_prereq} PreReq: /sbin/ldconfig PreReq: /usr/sbin/groupadd PreReq: coreutils +PreReq: grep +PreReq: samba-client >= %{version} %description winbind This is the winbind-daemon and the wbinfo-tool. @@ -1453,6 +1454,10 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || : %if 0%{?suse_version} > 1220 %service_add_post nmb.service smb.service %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf +grep -m 1 -q "^## Path:" %{_sysconfdir}/sysconfig/samba 2>/dev/null || ( \ + cat %{_var}/adm/fillup-templates/sysconfig.samba-client %{_sysconfdir}/sysconfig/samba 2>/dev/null \ + >%{_var}/adm/fillup-templates/sysconfig.samba-client.merged + mv %{_var}/adm/fillup-templates/sysconfig.samba-client.merged %{_sysconfdir}/sysconfig/samba ) %fillup_only %endif @@ -1524,9 +1529,6 @@ fi if ! test -e %{_bindir}/get_printing_ticket; then ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb fi -%if 0%{?suse_version} > 1220 -%{fillup_only -ans samba client} -%endif %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}} %postun client @@ -1608,6 +1610,10 @@ fi %if 0%{?suse_version} > 1220 %service_add_post winbind.service %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf +grep -m 1 -q "^## Path:" %{_sysconfdir}/sysconfig/samba 2>/dev/null || ( \ + cat %{_var}/adm/fillup-templates/sysconfig.samba-client %{_sysconfdir}/sysconfig/samba 2>/dev/null \ + >%{_var}/adm/fillup-templates/sysconfig.samba-client.merged + mv %{_var}/adm/fillup-templates/sysconfig.samba-client.merged %{_sysconfdir}/sysconfig/samba ) %{fillup_only -ans samba winbind} %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 3d91612..75cfa97 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:7ce801dae444ddf8c66358801678e1e460465a86836bad03c1e786fe68359e38 -size 52858 +oid sha256:9f660ee6421601bd8dedb081326b5bafae0273ce1ddf1f51ba887a20f5b5bd21 +size 53073 From 7116a1f8025d41eee08f2d2b97bdeb0155b2840fd61c341624f8882328320d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 25 Sep 2015 15:48:22 +0000 Subject: [PATCH 5/9] Relocate the tmpfiles.d directory to the client package; (bnc#947552). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=501 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d591063..25861bc 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c72a9314d0ceab45dfac826730e748f724c13a51be4f100a5ed2b2f9539b688e -size 29279 +oid sha256:a26a2801063701553bfc3e167a5a0db2bb09dcb345f5659d97be15ebb2f44c79 +size 29309 diff --git a/samba.changes b/samba.changes index f3a50cb..1ea7521 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 25 15:23:47 UTC 2015 - lmuelle@suse.com + +- Relocate the tmpfiles.d directory to the client package; (bnc#947552). + ------------------------------------------------------------------- Fri Sep 25 11:58:02 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index f079d53..52e34fc 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3492 +%define SOURCE_TIMESTAMP 3493 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1659,8 +1659,6 @@ fi %else %{_unitdir}/nmb.service %{_unitdir}/smb.service -%dir %{_tmpfilesdir} -%{_tmpfilesdir}/samba.conf %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd @@ -1818,6 +1816,8 @@ fi %{_libdir}/libnss_wins.so.* %dir %{_libdir}/samba %{_libdir}/samba/charset +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/samba.conf %{_mandir}/man1/dbwrap_tool.1.* %exclude %doc %{_mandir}/man1/findsmb.1.* %{_mandir}/man1/log2pcap.1.* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 75cfa97..cb37801 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:9f660ee6421601bd8dedb081326b5bafae0273ce1ddf1f51ba887a20f5b5bd21 -size 53073 +oid sha256:c3cd431060ed3c2cb4e59ce7d4b82fe85cb62eeba6c9e5fabb639df75b2f6478 +size 53011 From 7f56053649829c24587b2834d9fbe08528c7f4cb1ac7adcf3d11011bdb0d00b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 25 Sep 2015 16:37:48 +0000 Subject: [PATCH 6/9] Package the tmpfilesdir on post-12.2 systems only this fixes the previous commit for pre-12.3 builds OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=502 --- patches.tar.bz2 | 4 ++-- samba.spec | 7 ++++--- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 25861bc..11506c9 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a26a2801063701553bfc3e167a5a0db2bb09dcb345f5659d97be15ebb2f44c79 -size 29309 +oid sha256:e2572198a7ded7724edada0cef6e90b0910756baca9b6da5039e7c0dc61f04e8 +size 29251 diff --git a/samba.spec b/samba.spec index 52e34fc..51b101f 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3493 +%define SOURCE_TIMESTAMP 3494 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1769,6 +1769,9 @@ fi %endif %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml %ghost %{_localstatedir}/run/%{cifs_init_script} +%else +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/samba.conf %endif %dir %{CONFIGDIR} %config(noreplace) %{CONFIGDIR}/lmhosts @@ -1816,8 +1819,6 @@ fi %{_libdir}/libnss_wins.so.* %dir %{_libdir}/samba %{_libdir}/samba/charset -%dir %{_tmpfilesdir} -%{_tmpfilesdir}/samba.conf %{_mandir}/man1/dbwrap_tool.1.* %exclude %doc %{_mandir}/man1/findsmb.1.* %{_mandir}/man1/log2pcap.1.* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index cb37801..c6dbbdf 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:c3cd431060ed3c2cb4e59ce7d4b82fe85cb62eeba6c9e5fabb639df75b2f6478 -size 53011 +oid sha256:70ce2b9520f5ee63e1a39e4f6653f2641294876730d2792ca2b1574489ba36dc +size 52827 From af76b2230be6b1d61936850b9a6fc68f4fc4f8fc858d4795a1954482d60527b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 25 Sep 2015 19:28:45 +0000 Subject: [PATCH 7/9] Express post-12.2 simpler; no else case This is identical to the apparoch used before the tmpfilesdir relocation OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=503 --- patches.tar.bz2 | 4 ++-- samba.spec | 7 +++---- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 11506c9..0494462 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2572198a7ded7724edada0cef6e90b0910756baca9b6da5039e7c0dc61f04e8 -size 29251 +oid sha256:2cff97e99f20b3593429086946ced5becf5b402b226ac568c8b53c36aadaca33 +size 29242 diff --git a/samba.spec b/samba.spec index 51b101f..75c7a99 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3494 +%define SOURCE_TIMESTAMP 3495 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1769,9 +1769,6 @@ fi %endif %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml %ghost %{_localstatedir}/run/%{cifs_init_script} -%else -%dir %{_tmpfilesdir} -%{_tmpfilesdir}/samba.conf %endif %dir %{CONFIGDIR} %config(noreplace) %{CONFIGDIR}/lmhosts @@ -1864,6 +1861,8 @@ fi %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} %if 0%{?suse_version} > 1220 +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/samba.conf %{_var}/adm/fillup-templates/sysconfig.samba-client %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c6dbbdf..b909bb2 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:70ce2b9520f5ee63e1a39e4f6653f2641294876730d2792ca2b1574489ba36dc -size 52827 +oid sha256:31e784e5fc67a4940ff1ed2d05a7d566e51dabccbda50a95223b8b9374e3b716 +size 52838 From d399675f2669e0e2754b8ecb83d3cb7aae0d740077870221671359c450dd5461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 25 Sep 2015 22:22:41 +0000 Subject: [PATCH 8/9] Add an extra empty line Else the samba or samba-winbind sysconfig content gets directly added after the work "options" from the Decription line OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=504 --- patches.tar.bz2 | 4 ++-- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 0494462..f0a5840 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cff97e99f20b3593429086946ced5becf5b402b226ac568c8b53c36aadaca33 -size 29242 +oid sha256:707aaae289b21abbbffd8cad202da3825215c2b07e18ddb3a2bade4bb12b6b89 +size 29237 diff --git a/samba.spec b/samba.spec index 75c7a99..ff2dc3b 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3495 +%define SOURCE_TIMESTAMP 3496 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index b909bb2..e2c1a3e 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:31e784e5fc67a4940ff1ed2d05a7d566e51dabccbda50a95223b8b9374e3b716 -size 52838 +oid sha256:8d3fcb88eb7ddd2b675796d1699a9b3440e6b98add2dbd2ea058d41f63dc0736 +size 52869 From 7d3479f4c97cf0bde5caeed4041bdc1b634e364431be143dd23b928d09e2f6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 26 Sep 2015 17:31:40 +0000 Subject: [PATCH 9/9] Revert "Add missing sysconfig file header; (bnc#947361)." OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=505 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 ----- samba.spec | 14 ++++---------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index f0a5840..bb31284 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:707aaae289b21abbbffd8cad202da3825215c2b07e18ddb3a2bade4bb12b6b89 -size 29237 +oid sha256:8874bbeaca36120dfcf5ee0edc9f8b80217291f128cc6f503051d0faf3021321 +size 29242 diff --git a/samba.changes b/samba.changes index 1ea7521..5a40f95 100644 --- a/samba.changes +++ b/samba.changes @@ -3,11 +3,6 @@ Fri Sep 25 15:23:47 UTC 2015 - lmuelle@suse.com - Relocate the tmpfiles.d directory to the client package; (bnc#947552). -------------------------------------------------------------------- -Fri Sep 25 11:58:02 UTC 2015 - lmuelle@suse.com - -- Add missing sysconfig file header; (bnc#947361). - ------------------------------------------------------------------- Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index ff2dc3b..016ca6e 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3496 +%define SOURCE_TIMESTAMP 3499 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -434,7 +434,6 @@ PreReq: %{?insserv_prereq} PreReq: /sbin/ldconfig PreReq: /usr/sbin/groupadd PreReq: coreutils -PreReq: grep PreReq: samba-client >= %{version} %description winbind @@ -1454,10 +1453,6 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || : %if 0%{?suse_version} > 1220 %service_add_post nmb.service smb.service %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf -grep -m 1 -q "^## Path:" %{_sysconfdir}/sysconfig/samba 2>/dev/null || ( \ - cat %{_var}/adm/fillup-templates/sysconfig.samba-client %{_sysconfdir}/sysconfig/samba 2>/dev/null \ - >%{_var}/adm/fillup-templates/sysconfig.samba-client.merged - mv %{_var}/adm/fillup-templates/sysconfig.samba-client.merged %{_sysconfdir}/sysconfig/samba ) %fillup_only %endif @@ -1529,6 +1524,9 @@ fi if ! test -e %{_bindir}/get_printing_ticket; then ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb fi +%if 0%{?suse_version} > 1220 +%{fillup_only -ans samba client} +%endif %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}} %postun client @@ -1610,10 +1608,6 @@ fi %if 0%{?suse_version} > 1220 %service_add_post winbind.service %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf -grep -m 1 -q "^## Path:" %{_sysconfdir}/sysconfig/samba 2>/dev/null || ( \ - cat %{_var}/adm/fillup-templates/sysconfig.samba-client %{_sysconfdir}/sysconfig/samba 2>/dev/null \ - >%{_var}/adm/fillup-templates/sysconfig.samba-client.merged - mv %{_var}/adm/fillup-templates/sysconfig.samba-client.merged %{_sysconfdir}/sysconfig/samba ) %{fillup_only -ans samba winbind} %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e2c1a3e..5402ae2 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:8d3fcb88eb7ddd2b675796d1699a9b3440e6b98add2dbd2ea058d41f63dc0736 -size 52869 +oid sha256:bd3ffa44c58b0365d5be277d10165fe28bb68a9ff27235bdf6a7e5390e2126c5 +size 52888