- Define library names and use it instead of libldb1, libnetapi0,

libsmbclient0, libsmbsharemodes0, libtalloc2, libtdb1, libtevent0, and
  libwbclient0.
- Provide and obsolete libsmbsharemodes for post-10.3 SUSE systems.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=270
This commit is contained in:
Lars Müller 2012-12-02 16:24:49 +00:00 committed by Git OBS Bridge
parent ded32954f6
commit 4d24eeb8bb
6 changed files with 96 additions and 113 deletions

View File

@ -1 +1 @@
SOURCE_TIMESTAMP="2868"
SOURCE_TIMESTAMP="2869"

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fec8cc60783970758f56fb17a79e726ae41b53f4f82d809b6f50bced1d8452c2
size 44086
oid sha256:352a39080a538ff169519e3ecf21a65f1bba37422ef29adddbfabc295172bdbb
size 44090

View File

@ -98,6 +98,19 @@ BuildRequires: libtevent-devel
%if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%define libsmbclient_name libsmbclient
%define libsmbsharemodes_name libsmbsharemodes
%else
%define libsmbclient_name libsmbclient0
%define libsmbsharemodes_name libsmbsharemodes0
%endif
%define libldb_name libldb1
%define libnetapi_name libnetapi0
%define libwbclient_name libwbclient0
%define libtalloc_name libtalloc2
%define libtdb_name libtdb1
%define libtevent_name libtevent0
%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
%define libldb_ver 1.0.2
%define libtalloc_ver 2.0.5
@ -116,7 +129,7 @@ BuildRequires: libtevent-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 2868
%define SOURCE_TIMESTAMP 2869
%define BRANCH 3.6.9
Version: 3.6.9
Release: 0

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Dec 2 15:14:37 UTC 2012 - lmuelle@suse.com
- Define library names and use it instead of libldb1, libnetapi0,
libsmbclient0, libsmbsharemodes0, libtalloc2, libtdb1, libtevent0, and
libwbclient0.
- Provide and obsolete libsmbsharemodes for post-10.3 SUSE systems.
-------------------------------------------------------------------
Fri Nov 30 18:14:37 UTC 2012 - lmuelle@suse.com

View File

@ -98,6 +98,19 @@ BuildRequires: libtevent-devel
%if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%define libsmbclient_name libsmbclient
%define libsmbsharemodes_name libsmbsharemodes
%else
%define libsmbclient_name libsmbclient0
%define libsmbsharemodes_name libsmbsharemodes0
%endif
%define libldb_name libldb1
%define libnetapi_name libnetapi0
%define libwbclient_name libwbclient0
%define libtalloc_name libtalloc2
%define libtdb_name libtdb1
%define libtevent_name libtevent0
%if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
%define libldb_ver 1.0.2
%define libtalloc_ver 2.0.5
@ -116,7 +129,7 @@ BuildRequires: libtevent-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 2868
%define SOURCE_TIMESTAMP 2869
%define BRANCH 3.6.9
Version: 3.6.9
Release: 0
@ -382,12 +395,9 @@ Source timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%package -n libsmbclient
License: GPL-3.0+
%else
%package -n libsmbclient0
%package -n %{libsmbclient_name}
License: GPL-3.0+
%if 0%{?suse_version} > 1030
Provides: libsmbclient = %{version}
Obsoletes: libsmbclient
%endif
@ -398,11 +408,7 @@ Summary: Samba Client Library
Group: System/Libraries
PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient
%else
%description -n libsmbclient0
%endif
%description -n %{libsmbclient_name}
This package includes the libsmbclient library.
libsmbclient is provided by the libsmbclient0 package.
@ -426,15 +432,11 @@ BuildRequires: pkgconfig
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 921
Requires: heimdal-devel
Requires: libsmbclient = %{version}
Requires: %{libsmbclient_name} = %{version}
%else
%if 0%{?suse_version} && 0%{?suse_version} < 1031
Requires: krb5-devel
Requires: libsmbclient = %{version}
%else
Requires: krb5-devel
Requires: libsmbclient0 = %{version}
%endif
Requires: %{libsmbclient_name} = %{version}
%endif
%description -n libsmbclient-devel
@ -445,13 +447,13 @@ Source timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%package -n libnetapi0
%package -n %{libnetapi_name}
License: GPL-3.0+
Summary: Samba netapi Library
Group: System/Libraries
PreReq: /sbin/ldconfig
%description -n libnetapi0
%description -n %{libnetapi_name}
This package includes the netapi library.
Source timestamp: %{SOURCE_TIMESTAMP}
@ -467,7 +469,7 @@ BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
Requires: libnetapi0 = %{version}
Requires: %{libnetapi_name} = %{version}
%description -n libnetapi-devel
This package contains the static libraries and header files needed to
@ -477,22 +479,17 @@ Source timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%package -n libsmbsharemodes
License: GPL-3.0+
%else
%package -n libsmbsharemodes0
%package -n %{libsmbsharemodes_name}
License: GPL-3.0+
%if 0%{?suse_version} > 1030
Provides: libsmbsharemodes = %{version}
Obsoletes: libsmbsharemodes
%endif
Summary: Samba smbsharemodes Library
Group: System/Libraries
PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes
%else
%description -n libsmbsharemodes0
%endif
%description -n %{libsmbsharemodes_name}
This package includes the smbsharemodes library.
Source timestamp: %{SOURCE_TIMESTAMP}
@ -508,10 +505,7 @@ BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1031
Requires: libsmbsharemodes = %{version}
%else
Requires: libsmbsharemodes0 = %{version}
Requires: %{libsmbsharemodes_name} = %{version}
%endif
%description -n libsmbsharemodes-devel
@ -522,13 +516,13 @@ Source timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%package -n libwbclient0
%package -n %{libwbclient_name}
License: LGPL-3.0+
Summary: Samba libwbclient Library
Group: System/Libraries
PreReq: /sbin/ldconfig
%description -n libwbclient0
%description -n %{libwbclient_name}
This package includes the wbclient library.
Source timestamp: %{SOURCE_TIMESTAMP}
@ -544,7 +538,7 @@ BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
Requires: libwbclient0 = %{version}
Requires: %{libwbclient_name} = %{version}
%description -n libwbclient-devel
This package contains the static libraries and header files needed to
@ -556,14 +550,14 @@ Branch: %{BRANCH}
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%package -n libtalloc2
%package -n %{libtalloc_name}
Version: %{libtalloc_ver}
License: LGPL-3.0+
Summary: Samba talloc Library
Group: System/Libraries
PreReq: /sbin/ldconfig
%description -n libtalloc2
%description -n %{libtalloc_name}
This package includes the talloc library.
Source timestamp: %{SOURCE_TIMESTAMP}
@ -580,7 +574,7 @@ BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
Requires: libtalloc2 = %{libtalloc_ver}
Requires: %{libtalloc_name} = %{libtalloc_ver}
%description -n libtalloc-devel
This package contains the static libraries and header files needed to
@ -590,14 +584,14 @@ Source timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%package -n libtdb1
%package -n %{libtdb_name}
Version: %{libtdb_ver}
License: LGPL-3.0+
Summary: Samba tdb Library
Group: System/Libraries
PreReq: /sbin/ldconfig
%description -n libtdb1
%description -n %{libtdb_name}
This package includes the tdb library.
Source timestamp: %{SOURCE_TIMESTAMP}
@ -610,7 +604,7 @@ License: LGPL-3.0+
Summary: Libraries and Header Files to Develop Programs with tdb Support
Group: Development/Libraries/C and C++
#BuildRequires: pkg-config
Requires: libtdb1 = %{libtdb_ver}
Requires: %{libtdb_name} = %{libtdb_ver}
%description -n libtdb-devel
This package contains the static libraries and header files needed to
@ -620,14 +614,14 @@ Source timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%package -n libtevent0
%package -n %{libtevent_name}
Version: %{libtevent_ver}
License: LGPL-3.0+
Summary: Samba tevent Library
Group: System/Libraries
PreReq: /sbin/ldconfig
%description -n libtevent0
%description -n %{libtevent_name}
This package includes the tevent library.
Source timestamp: %{SOURCE_TIMESTAMP}
@ -645,7 +639,7 @@ BuildRequires: pkg-config
BuildRequires: pkgconfig
%endif
Requires: libtalloc-devel
Requires: libtevent0 = %{libtevent_ver}
Requires: %{libtevent_name} = %{libtevent_ver}
%description -n libtevent-devel
This package contains the static libraries and header files needed to
@ -655,7 +649,7 @@ Source timestamp: %{SOURCE_TIMESTAMP}
Branch: %{BRANCH}
%package -n libldb1
%package -n %{libldb_name}
Version: %{libldb_ver}
License: LGPL-3.0+
Summary: Samba ldb Library
@ -663,7 +657,7 @@ Group: System/Libraries
BuildRequires: popt-devel
PreReq: /sbin/ldconfig
%description -n libldb1
%description -n %{libldb_name}
This package includes the ldb library.
Source timestamp: %{SOURCE_TIMESTAMP}
@ -680,7 +674,7 @@ BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
Requires: libldb1 = %{libldb_ver}
Requires: %{libldb_name} = %{libldb_ver}
Requires: libtalloc-devel
%description -n libldb-devel
@ -1300,35 +1294,31 @@ fi
/sbin/ldconfig
%{?insserv_cleanup:%{insserv_cleanup}}
%post -n libnetapi0 -p /sbin/ldconfig
%post -n %{libnetapi_name} -p /sbin/ldconfig
%postun -n libnetapi0 -p /sbin/ldconfig
%postun -n %{libnetapi_name} -p /sbin/ldconfig
%post -n %{libwbclient_name} -p /sbin/ldconfig
%postun -n %{libwbclient_name} -p /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%post -n libtalloc2 -p /sbin/ldconfig
%post -n %{libtalloc_name} -p /sbin/ldconfig
%postun -n libtalloc2 -p /sbin/ldconfig
%postun -n %{libtalloc_name} -p /sbin/ldconfig
%endif
%post -n %{libtdb_name} -p /sbin/ldconfig
%post -n libwbclient0 -p /sbin/ldconfig
%postun -n %{libtdb_name} -p /sbin/ldconfig
%postun -n libwbclient0 -p /sbin/ldconfig
%post -n %{libtevent_name} -p /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%postun -n %{libtevent_name} -p /sbin/ldconfig
%post -n libtdb1 -p /sbin/ldconfig
%post -n %{libldb_name} -p /sbin/ldconfig
%postun -n libtdb1 -p /sbin/ldconfig
%post -n libtevent0 -p /sbin/ldconfig
%postun -n libtevent0 -p /sbin/ldconfig
%post -n libldb1 -p /sbin/ldconfig
%postun -n libldb1 -p /sbin/ldconfig
%postun -n %{libldb_name} -p /sbin/ldconfig
%endif
@ -1393,33 +1383,13 @@ fi
%{?restart_on_update:%{restart_on_update nscd winbind}}
%{?insserv_cleanup:%{insserv_cleanup}}
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%post -n libsmbclient
%else
%post -n libsmbclient0
%endif
/sbin/ldconfig
%post -n %{libsmbclient_name} -p /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%postun -n libsmbclient
%else
%postun -n libsmbclient0
%endif
/sbin/ldconfig
%postun -n %{libsmbclient_name} -p /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%post -n libsmbsharemodes
%else
%post -n libsmbsharemodes0
%endif
/sbin/ldconfig
%post -n %{libsmbsharemodes_name} -p /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%postun -n libsmbsharemodes
%else
%postun -n libsmbsharemodes0
%endif
/sbin/ldconfig
%postun -n %{libsmbsharemodes_name} -p /sbin/ldconfig
%clean
[ x"%{buildroot}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "%{buildroot}"
@ -1705,7 +1675,7 @@ fi
%dir %{cups_lib_dir}/backend
%ghost %{cups_lib_dir}/backend/smb
%files -n libnetapi0
%files -n %{libnetapi_name}
%defattr(-,root,root)
%{_libdir}/libnetapi.so.*
@ -1718,11 +1688,7 @@ fi
%{_libdir}/libnetapi.so
%{_libdir}/pkgconfig/netapi.pc
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%files -n libsmbclient
%else
%files -n libsmbclient0
%endif
%files -n %{libsmbclient_name}
%defattr(-,root,root)
%{_libdir}/libsmbclient.so.*
%doc %{_mandir}/man7/libsmbclient.7.*
@ -1736,11 +1702,7 @@ fi
%{_libdir}/libsmbclient.so
%{_libdir}/pkgconfig/smbclient.pc
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%files -n libsmbsharemodes
%else
%files -n libsmbsharemodes0
%endif
%files -n %{libsmbsharemodes_name}
%defattr(-,root,root)
%{_libdir}/libsmbsharemodes.so.*
@ -1755,7 +1717,7 @@ fi
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%files -n libtalloc2
%files -n %{libtalloc_name}
%defattr(-,root,root)
%{_libdir}/libpytalloc-util.so.*
%{_libdir}/libtalloc.so.*
@ -1772,7 +1734,7 @@ fi
%{_libdir}/pkgconfig/pytalloc-util.pc
%{_libdir}/pkgconfig/talloc.pc
%files -n libtdb1
%files -n %{libtdb_name}
%defattr(-,root,root)
%{_libdir}/libtdb.so.*
@ -1787,7 +1749,7 @@ fi
%endif
%files -n libwbclient0
%files -n %{libwbclient_name}
%defattr(-,root,root)
%{_libdir}/libwbclient.so.*
@ -1801,7 +1763,7 @@ fi
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%files -n libtevent0
%files -n %{libtevent_name}
%defattr(-,root,root)
%{_libdir}/libtevent.so.*
@ -1811,7 +1773,7 @@ fi
%{_libdir}/libtevent.so
%{_libdir}/pkgconfig/tevent.pc
%files -n libldb1
%files -n %{libldb_name}
%defattr(-,root,root)
%{_libdir}/libldb.so.*
%dir %{_libdir}/ldb

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d146e1dcd09e0dded5c6336d58deca763e5bdb819241dc0de0baef6386a5fe0f
size 53431
oid sha256:28886d1da8cbf40531cfc7a5e839519b57ad10610f5fa7ba2aae9f2d704dcd31
size 53445