From 4bbe1d5392416981b783051dd80b4aacea43c748bc4bcf3de2795e2a988ef2a3 Mon Sep 17 00:00:00 2001
From: Samuel Cabrero <scabrero@suse.com>
Date: Thu, 30 Apr 2020 19:18:06 +0000
Subject: [PATCH] Accepting request 799244 from home:npower:update_samba_4.12.2

- Move libdcerpc-server-core.so to samba-libs package, this was
  initially erroneously located in  samba-ad-dc.

OBS-URL: https://build.opensuse.org/request/show/799244
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=630
---
 samba-4.12.2+git.143.2f6e5bda2e3.tar.bz2 |  3 ---
 samba-4.12.2+git.149.16ff41ef1f4.tar.bz2 |  3 +++
 samba.changes                            |  6 ++++++
 samba.spec                               | 11 +++++------
 4 files changed, 14 insertions(+), 9 deletions(-)
 delete mode 100644 samba-4.12.2+git.143.2f6e5bda2e3.tar.bz2
 create mode 100644 samba-4.12.2+git.149.16ff41ef1f4.tar.bz2

diff --git a/samba-4.12.2+git.143.2f6e5bda2e3.tar.bz2 b/samba-4.12.2+git.143.2f6e5bda2e3.tar.bz2
deleted file mode 100644
index 9795e04..0000000
--- a/samba-4.12.2+git.143.2f6e5bda2e3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8643dc97ef77ad2770cd3b06dacc8228ab28a3007164e6bc00817e1e8308039
-size 24686149
diff --git a/samba-4.12.2+git.149.16ff41ef1f4.tar.bz2 b/samba-4.12.2+git.149.16ff41ef1f4.tar.bz2
new file mode 100644
index 0000000..6c7ebd8
--- /dev/null
+++ b/samba-4.12.2+git.149.16ff41ef1f4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f089f6fed9646f7405b66a306b5a12eab9cff6341167d29a76e03d31b2de461
+size 24685949
diff --git a/samba.changes b/samba.changes
index 5a88a44..0f7fbfa 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 29 15:48:50 UTC 2020 - Noel Power <nopower@suse.com>
+
+- Move libdcerpc-server-core.so to samba-libs package, this was
+  initially erroneously located in  samba-ad-dc.
+
 -------------------------------------------------------------------
 Tue Apr 28 11:44:07 UTC 2020 - Noel Power <nopower@suse.com>
 
diff --git a/samba.spec b/samba.spec
index e212c2c..84cca46 100644
--- a/samba.spec
+++ b/samba.spec
@@ -164,7 +164,7 @@ BuildRequires:  libtasn1-devel >= 3.8
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.12.2+git.143.2f6e5bda2e3
+Version:        4.12.2+git.149.16ff41ef1f4
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -1784,9 +1784,9 @@ exit 0
 %{_includedir}/samba
 %dir %_includedir/samba-4.0/
 %_includedir/samba-4.0/charset.h
+%_includedir/samba-4.0/dcesrv_core.h
 %if %{with_dc}
 %_includedir/samba-4.0/dcerpc_server.h
-%_includedir/samba-4.0/dcesrv_core.h
 %endif
 %dir %_includedir/samba-4.0/core/
 %_includedir/samba-4.0/core/doserr.h
@@ -1859,6 +1859,8 @@ exit 0
 %{_libdir}/samba/libdbwrap-samba4.so
 %{_libdir}/samba/libdcerpc-samba-samba4.so
 %{_libdir}/samba/libdcerpc-samba4.so
+%{_libdir}/libdcerpc-server-core.so.0
+%{_libdir}/libdcerpc-server-core.so.0.0.1
 %if %{with_dc}
 %{_libdir}/samba/libdb-glue-samba4.so
 %{_libdir}/samba/libdfs-server-ad-samba4.so
@@ -2182,12 +2184,11 @@ exit 0
 %_libdir/libdcerpc.so
 %_libdir/libdcerpc-binding.so
 %_libdir/pkgconfig/dcerpc.pc
+%_libdir/libdcerpc-server-core.so
 %if %{with_dc}
 %_libdir/libdcerpc-server.so
-%_libdir/libdcerpc-server-core.so
 %_libdir/pkgconfig/dcerpc_server.pc
 %endif
-
 %files -n libndr-krb5pac0
 %defattr(-,root,root)
 %_libdir/libndr-krb5pac.so.0*
@@ -2430,8 +2431,6 @@ exit 0
 %{_libdir}/krb5/plugins/kdb/samba.so
 %{_libdir}/libdcerpc-server.so.0
 %{_libdir}/libdcerpc-server.so.0.0.1
-%{_libdir}/libdcerpc-server-core.so.0
-%{_libdir}/libdcerpc-server-core.so.0.0.1
 %{_libdir}/samba/bind9
 %{_libdir}/samba/bind9/dlz_bind9.so
 %{_libdir}/samba/bind9/dlz_bind9_10.so