- Remove obsoleted references to pre-9.4 SUSE systems; (bnc#792294).

- Add SUSE version depending pkg-config requires macro; (bnc#792294).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=272
This commit is contained in:
Lars Müller 2012-12-02 22:09:01 +00:00 committed by Git OBS Bridge
parent 4f0d87b6be
commit daf782f4b6
6 changed files with 28 additions and 64 deletions

View File

@ -1 +1 @@
SOURCE_TIMESTAMP="2870"
SOURCE_TIMESTAMP="2871"

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a131185ec6513952a58beea0356044eb044565ea185e7156b4a3fe84b828417
size 44077
oid sha256:289e24e9d11fb3cf2a2ac20f8892a7c7252707283952c6b871d79116cda51b54
size 44064

View File

@ -56,9 +56,6 @@ BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: xfsprogs-devel
%endif
%if 0%{?suse_version} > 830 && 0%{?suse_version} < 931
BuildRequires: heimdal-devel
%endif
%if 0%{?fedora_version}
BuildRequires: cracklib-devel
%endif
@ -80,10 +77,11 @@ BuildRequires: ctdb-devel > 1.0.105
BuildRequires: fdupes
%endif
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%define pkgconfig_req pkg-config
%else
BuildRequires: pkgconfig
%define pkgconfig_req pkgconfig
%endif
BuildRequires: %{pkgconfig_req}
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
BuildRequires: libldb-devel
#!BuildIgnore: libtalloc
@ -129,7 +127,7 @@ BuildRequires: libtevent-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 2870
%define SOURCE_TIMESTAMP 2871
%define BRANCH 3.6.9
Version: 3.6.9
Release: 0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Dec 2 21:47:01 UTC 2012 - lmuelle@suse.com
- Remove obsoleted references to pre-9.4 SUSE systems; (bnc#792294).
- Add SUSE version depending pkg-config requires macro; (bnc#792294).
-------------------------------------------------------------------
Sun Dec 2 15:14:37 UTC 2012 - lmuelle@suse.com

View File

@ -56,9 +56,6 @@ BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: xfsprogs-devel
%endif
%if 0%{?suse_version} > 830 && 0%{?suse_version} < 931
BuildRequires: heimdal-devel
%endif
%if 0%{?fedora_version}
BuildRequires: cracklib-devel
%endif
@ -80,10 +77,11 @@ BuildRequires: ctdb-devel > 1.0.105
BuildRequires: fdupes
%endif
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%define pkgconfig_req pkg-config
%else
BuildRequires: pkgconfig
%define pkgconfig_req pkgconfig
%endif
BuildRequires: %{pkgconfig_req}
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
BuildRequires: libldb-devel
#!BuildIgnore: libtalloc
@ -129,7 +127,7 @@ BuildRequires: libtevent-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 2870
%define SOURCE_TIMESTAMP 2871
%define BRANCH 3.6.9
Version: 3.6.9
Release: 0
@ -425,19 +423,9 @@ Branch: %{BRANCH}
License: GPL-3.0+
Summary: Libraries and Header Files to Develop Programs with smbclient Support
Group: Development/Libraries/C and C++
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 921
Requires: heimdal-devel
Requires: %{libsmbclient_name} = %{version}
%else
%if 0%{?suse_version} && 0%{?suse_version} < 1031
BuildRequires: %{pkgconfig_req}
Requires: krb5-devel
Requires: %{libsmbclient_name} = %{version}
%endif
%description -n libsmbclient-devel
This package contains the static libraries and header files needed to
@ -464,11 +452,7 @@ Branch: %{BRANCH}
License: GPL-3.0+
Summary: Libraries and Header Files to Develop Programs with netapi Support
Group: Development/Libraries/C and C++
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: %{pkgconfig_req}
Requires: %{libnetapi_name} = %{version}
%description -n libnetapi-devel
@ -500,11 +484,7 @@ Branch: %{BRANCH}
License: GPL-3.0+
Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support
Group: Development/Libraries/C and C++
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: %{pkgconfig_req}
Requires: %{libsmbsharemodes_name} = %{version}
%endif
@ -533,11 +513,7 @@ Branch: %{BRANCH}
License: LGPL-3.0+
Summary: Libraries and Header Files to Develop Programs with wbclient Support
Group: Development/Libraries/C and C++
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: %{pkgconfig_req}
Requires: %{libwbclient_name} = %{version}
%description -n libwbclient-devel
@ -569,11 +545,7 @@ Version: %{libtalloc_ver}
License: LGPL-3.0+
Summary: Libraries and Header Files to Develop Programs with talloc Support
Group: Development/Libraries/C and C++
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: %{pkgconfig_req}
Requires: %{libtalloc_name} = %{libtalloc_ver}
%description -n libtalloc-devel
@ -603,7 +575,7 @@ Version: %{libtdb_ver}
License: LGPL-3.0+
Summary: Libraries and Header Files to Develop Programs with tdb Support
Group: Development/Libraries/C and C++
#BuildRequires: pkg-config
#BuildRequires: %{pkgconfig_req}
Requires: %{libtdb_name} = %{libtdb_ver}
%description -n libtdb-devel
@ -633,11 +605,7 @@ Version: %{libtevent_ver}
License: LGPL-3.0+
Summary: Libraries and Header Files to Develop Programs with tevent Support
Group: Development/Libraries/C and C++
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: %{pkgconfig_req}
Requires: libtalloc-devel
Requires: %{libtevent_name} = %{libtevent_ver}
@ -669,11 +637,7 @@ Version: %{libldb_ver}
License: LGPL-3.0+
Summary: Libraries and Header Files to Develop Programs with ldb Support
Group: Development/Libraries/C and C++
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: %{pkgconfig_req}
Requires: %{libldb_name} = %{libldb_ver}
Requires: libtalloc-devel
@ -1068,11 +1032,7 @@ install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
touch %{buildroot}/var/run/%{cifs_init_script}
install -m 0644 config/swat.xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/swat
install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
%if 0%{?suse_version} && 0%{?suse_version} < 921
install -m 0644 config/samba.pamd %{buildroot}/%{_sysconfdir}/pam.d/samba
%else
install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
%endif
install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf
install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client
for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd %{cifs_init_script}; do

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0aa2790df8ffb075c031b67897334eda32ca636fdd1e0515c88818e11bf868f
size 53451
oid sha256:01bc50088e2226009b8cb20cc1079c5a736e27ada9676231df432fbc78917dab
size 53427