From 878eac0d9c25080c9cbb53b115b8520def8b26460bcb59c90ba442b30e181139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 5 Jun 2015 17:07:39 +0000 Subject: [PATCH 1/4] Remove build time requirement to dropped fam-devel on post-6 RHEL systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=467 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 4 +++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 92578b2..96c8d42 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71c10da7ffad414d7bff1098fac0cf650c403df08e7cd647e9a30143626d50ae -size 103388 +oid sha256:fe929ee131e2224a61bf49c1a2e9bab1f5abf9ffff1fe2564f645f9a2e71efff +size 103230 diff --git a/samba.changes b/samba.changes index 1245664..3bae717 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 5 16:12:47 UTC 2015 - lmuelle@suse.com + +- Remove build time requirement to dropped fam-devel on post-6 RHEL systems. + ------------------------------------------------------------------- Fri May 29 12:23:07 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 44e67e3..0492cd7 100644 --- a/samba.spec +++ b/samba.spec @@ -34,8 +34,10 @@ BuildRequires: libarchive-devel %if 0%{?suse_version} > 1210 BuildRequires: gamin-devel %else +%if 0%{?rhel_version} < 700 BuildRequires: fam-devel %endif +%endif BuildRequires: krb5-devel BuildRequires: libacl-devel BuildRequires: libattr-devel @@ -143,7 +145,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3408 +%define SOURCE_TIMESTAMP 3410 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 53a51ca..9eb26ac 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:a5c5bf9f839d65a55317a7e42525c8eb109ca0cf6422526b56945d011c510d00 -size 52914 +oid sha256:71099b0fcdd271a92a9428e40892342a4775d84650184ef3555bbfbaa90b4c8f +size 52780 From 7c6c05f5175f79e6747c809bfd9c2fba1bffed416e6fc5a049c8411e6d9b62e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 5 Jun 2015 17:51:05 +0000 Subject: [PATCH 2/4] Cleanup/ round over/ correction of 467 Remove fam-devel build-time dependency for post-6 RHEL systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=468 --- 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 96c8d42..b3ccf33 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe929ee131e2224a61bf49c1a2e9bab1f5abf9ffff1fe2564f645f9a2e71efff -size 103230 +oid sha256:1145524a1b505a07c91fc3330e08b4cdde61ec8194ba82fb4c9a301071d48669 +size 103139 diff --git a/samba.changes b/samba.changes index 3bae717..e84f3bb 100644 --- a/samba.changes +++ b/samba.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Jun 5 16:12:47 UTC 2015 - lmuelle@suse.com -- Remove build time requirement to dropped fam-devel on post-6 RHEL systems. +- Remove fam-devel build-time dependency for post-6 RHEL systems. ------------------------------------------------------------------- Fri May 29 12:23:07 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 0492cd7..abd95d0 100644 --- a/samba.spec +++ b/samba.spec @@ -145,7 +145,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3410 +%define SOURCE_TIMESTAMP 3411 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 9eb26ac..961e59e 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:71099b0fcdd271a92a9428e40892342a4775d84650184ef3555bbfbaa90b4c8f -size 52780 +oid sha256:73c9467c1d7791a5bbae1082a26cc7e0f5f2651ea372437872ab0b16fb15196c +size 52788 From f1850196d9a6e228b4dc9c6942caa4101192db2b2ec8498c640334553682dbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 9 Jun 2015 10:32:08 +0000 Subject: [PATCH 3/4] Order winbind.service Before and Want nss-user-lookup.target; (sr#310657). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=469 --- 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 b3ccf33..5532611 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1145524a1b505a07c91fc3330e08b4cdde61ec8194ba82fb4c9a301071d48669 -size 103139 +oid sha256:13585d02271218d23f90150e8f6b75cc8a0ac9b807ab42970a33a57af8e1814d +size 103358 diff --git a/samba.changes b/samba.changes index e84f3bb..b924ad5 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jun 6 03:41:17 UTC 2015 - crrodriguez@opensuse.org + +- Order winbind.service Before and Want nss-user-lookup.target; (sr#310657). + ------------------------------------------------------------------- Fri Jun 5 16:12:47 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index abd95d0..a923128 100644 --- a/samba.spec +++ b/samba.spec @@ -145,7 +145,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3411 +%define SOURCE_TIMESTAMP 3412 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 961e59e..fb20b00 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:73c9467c1d7791a5bbae1082a26cc7e0f5f2651ea372437872ab0b16fb15196c -size 52788 +oid sha256:f176df484e6d9cf5fef2a835fcbe53a0a5f27f9f07e0b028f78ff76eb28edb6e +size 52893 From 08e6f129d5cbffa2ebaf2532fbe083b3aefbd30ae709fb87560a0502c3fca908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 9 Jun 2015 10:50:34 +0000 Subject: [PATCH 4/4] Nuke the submit request reference due to doubt value New package change log: Order winbind.service Before and Want nss-user-lookup target. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=470 --- 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 5532611..755f92a 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13585d02271218d23f90150e8f6b75cc8a0ac9b807ab42970a33a57af8e1814d -size 103358 +oid sha256:9e1d6fe17d98959fda48ebf406a88e9d5d8a4c31af68e229c48facf9246d8d6e +size 103362 diff --git a/samba.changes b/samba.changes index b924ad5..280bf31 100644 --- a/samba.changes +++ b/samba.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sat Jun 6 03:41:17 UTC 2015 - crrodriguez@opensuse.org -- Order winbind.service Before and Want nss-user-lookup.target; (sr#310657). +- Order winbind.service Before and Want nss-user-lookup target. ------------------------------------------------------------------- Fri Jun 5 16:12:47 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index a923128..6cece98 100644 --- a/samba.spec +++ b/samba.spec @@ -145,7 +145,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3412 +%define SOURCE_TIMESTAMP 3413 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index fb20b00..4bda153 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:f176df484e6d9cf5fef2a835fcbe53a0a5f27f9f07e0b028f78ff76eb28edb6e -size 52893 +oid sha256:59d3a106f7b6f969d0be2b31d90aa3f65312844121ad3aa31e39efc494078324 +size 52863