Accepting request 655864 from home:dmulder:branches:network:samba:STABLE

Fix package naming and dependencies

OBS-URL: https://build.opensuse.org/request/show/655864
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=611

baselibs.conf

@@ -12,7 +12,7 @@ libsamba-hostconfig0
 libsamba-passdb0
   obsoletes "libpdb0-<targettype> < <version>"
 libsamba-policy0-python3
-libsamba-policy0-python
+libsamba-policy0
 libsamba-util0
 libsamdb0
 libsmbclient0

samba-4.9.3+git.119.fdb1964c208.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54f1ae4348f307645e962ab9b7944e35b907f1b7a02de2294c14701e21d951fb
-size 24644920

samba-4.9.3+git.121.c328d5e9101.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10cf75bb97fe733f72c52fe73ea23f7470e13a14b413cfc40c9e53110b302e8f
+size 24645183

samba.spec

@@ -168,7 +168,7 @@ BuildRequires:  krb5-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.9.3+git.119.fdb1964c208
+Version:        4.9.3+git.121.c328d5e9101
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -318,7 +318,7 @@ Requires:       krb5
 %if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315
 Requires:       libfam0-gamin
 %endif
-Requires:       samba-libs-python
+Requires:       samba-libs-python = %{version}
 
 %description libs
 The samba-libs package contains the libraries needed by programs that
@@ -365,6 +365,7 @@ Requires:       python-ldb
 Requires:       python-talloc
 Requires:       python-tdb
 Requires:       python-tevent
+Requires:       libsamba-policy0 = %{version}
 %endif
 
 %description python
@@ -380,6 +381,7 @@ Requires:       python3-ldb
 Requires:       python3-talloc
 Requires:       python3-tdb
 Requires:       python3-tevent
+Requires:       libsamba-policy0-python3 = %{version}
 
 %description python3
 The samba-python3 package contains the Python libraries needed by programs
@@ -717,24 +719,22 @@ This subpackage contains libraries and header files for developing
 applications that want to make use of libsamba-passdb.
 
 
+%package -n libsamba-policy0
+Summary:        Active Directory Group Policy library
+License:        GPL-3.0-or-later
+Group:          System/Libraries
+
+%description -n libsamba-policy0
+This subpackage contains the python2 library for policy management.
+
 %package -n libsamba-policy0-python3
 Summary:        Active Directory Group Policy library
 License:        GPL-3.0-or-later
 Group:          System/Libraries
-Provides:       libsamba-policy0
 
 %description -n libsamba-policy0-python3
 This subpackage contains the python3 library for policy management.
 
-%package -n libsamba-policy0-python
-Summary:        Active Directory Group Policy library
-License:        GPL-3.0-or-later
-Group:          System/Libraries
-Provides:       libsamba-policy0
-
-%description -n libsamba-policy0-python
-This subpackage contains the python2 library for policy management.
-
 %package -n libsamba-policy-devel
 Summary:        Development files for the Samba AD Group Policy library
 License:        GPL-3.0-or-later
@@ -760,7 +760,7 @@ applications that want to make use of libsamba-policy.
 Summary:        Development files for the Samba AD Group Policy library
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libsamba-policy0-python = %{version}
+Requires:       libsamba-policy0 = %{version}
 
 %description -n libsamba-policy-python-devel
 This subpackage contains libraries and header files for developing
@@ -1562,8 +1562,8 @@ fi
 %postun -n libsamba-policy0-python3 -p /sbin/ldconfig
 %endif
 %if %{with_python}
-%post   -n libsamba-policy0-python -p /sbin/ldconfig
+%post   -n libsamba-policy0 -p /sbin/ldconfig
-%postun -n libsamba-policy0-python -p /sbin/ldconfig
+%postun -n libsamba-policy0 -p /sbin/ldconfig
 %endif
 %post   -n libsamba-util0 -p /sbin/ldconfig
 %postun -n libsamba-util0 -p /sbin/ldconfig
@@ -2432,7 +2432,7 @@ exit 0
 %_includedir/samba-4.0/passdb.h
 %_libdir/libsamba-passdb.so
 
-%files -n libsamba-policy0-python
+%files -n libsamba-policy0
 %defattr(-,root,root)
 %if %{with_python}
 %_libdir/libsamba-policy.so.0*