Accepting request 530461 from home:jengelh:branches:network:samba:STABLE

- Remove %if guards for blocks that do not affect the build result.
  Fix RPM groups and summaries. Ensure neutrality of descriptions.
  Drop very old SUSE support. Replace old RPM macros by new
  constructs. Remove some useless ldconfig calls.

OBS-URL: https://build.opensuse.org/request/show/530461
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/tdb?expand=0&rev=93
This commit is contained in:
James McDonough 2017-10-03 11:23:12 +00:00 committed by Git OBS Bridge
parent 93853eb470
commit 3720ec60e5
2 changed files with 26 additions and 60 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Oct 2 12:18:30 UTC 2017 - jengelh@inai.de
- Remove %if guards for blocks that do not affect the build result.
Fix RPM groups and summaries. Ensure neutrality of descriptions.
Drop very old SUSE support. Replace old RPM macros by new
constructs. Remove some useless ldconfig calls.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 25 11:14:05 UTC 2017 - scabrero@suse.com Mon Sep 25 11:14:05 UTC 2017 - scabrero@suse.com

View File

@ -25,20 +25,11 @@
%endif %endif
Name: tdb Name: tdb
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
%define build_make_smp_mflags %{?_smp_mflags}
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: libxslt BuildRequires: libxslt
%if 0%{?suse_version} > 1020
BuildRequires: pkg-config BuildRequires: pkg-config
%else
BuildRequires: pkgconfig
%endif
BuildRequires: python-devel BuildRequires: python-devel
%if %{with_python3} %if %{with_python3}
BuildRequires: python3-devel BuildRequires: python3-devel
@ -48,7 +39,7 @@ Version: 1.3.15
Release: 0 Release: 0
Summary: Samba Trivial Database Summary: Samba Trivial Database
License: GPL-3.0+ License: GPL-3.0+
Group: System/Libraries Group: Development/Libraries/C and C++
Source: https://download.samba.org/pub/tdb/tdb-%{version}.tar.gz Source: https://download.samba.org/pub/tdb/tdb-%{version}.tar.gz
Source1: https://download.samba.org/pub/tdb/tdb-%{version}.tar.asc Source1: https://download.samba.org/pub/tdb/tdb-%{version}.tar.asc
Source2: tdb.keyring Source2: tdb.keyring
@ -58,22 +49,18 @@ Patch1: build_pie.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB,
except that it allows multiple simultaneous writers and uses locking except that it allows multiple simultaneous writers and uses locking
internally to keep writers from trampling on each other. TDB is also extremely internally to keep writers from trampling on each other.
small.
%package -n libtdb1 %package -n libtdb1
Summary: Libraries and Header Files to Develop Programs with tdb1 Support Summary: Samba Trivial Database
Group: System/Libraries Group: System/Libraries
PreReq: /sbin/ldconfig
%description -n libtdb1 %description -n libtdb1
TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB,
except that it allows multiple simultaneous writers and uses locking except that it allows multiple simultaneous writers and uses locking
internally to keep writers from trampling on each other. TDB is also extremely internally to keep writers from trampling on each other.
small.
This package contains the tdb1 library. This package contains the tdb1 library.
@ -82,17 +69,12 @@ This package contains the tdb1 library.
Summary: Libraries and Header Files to Develop Programs with tdb1 Support Summary: Libraries and Header Files to Develop Programs with tdb1 Support
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libtdb1 = %{version} Requires: libtdb1 = %{version}
%if 0%{?suse_version} > 1020
Requires: pkg-config Requires: pkg-config
%else
Requires: pkgconfig
%endif
%description -n libtdb-devel %description -n libtdb-devel
TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB,
except that it allows multiple simultaneous writers and uses locking except that it allows multiple simultaneous writers and uses locking
internally to keep writers from trampling on each other. TDB is also extremely internally to keep writers from trampling on each other.
small.
This package contains libraries and header files need for development. This package contains libraries and header files need for development.
@ -102,10 +84,9 @@ Summary: Tools to manipulate tdb files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description -n tdb-tools %description -n tdb-tools
TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB,
except that it allows multiple simultaneous writers and uses locking except that it allows multiple simultaneous writers and uses locking
internally to keep writers from trampling on each other. TDB is also extremely internally to keep writers from trampling on each other.
small.
This package contains tools to manage Tdb files. This package contains tools to manage Tdb files.
@ -115,23 +96,18 @@ Summary: Python bindings for the Tdb library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: libtdb1 = %{version} Requires: libtdb1 = %{version}
Conflicts: python3-tdb Conflicts: python3-tdb
PreReq: /sbin/ldconfig
%description -n python-tdb %description -n python-tdb
This package contains the python bindings for the Tdb library. This package contains the Python bindings for the Tdb library.
%if %{with_python3}
%package -n python3-tdb %package -n python3-tdb
Summary: Python3 bindings for the Tdb library Summary: Python3 bindings for the Tdb library
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: libtdb1 = %{version} Requires: libtdb1 = %{version}
Conflicts: python-tdb Conflicts: python-tdb
PreReq: /sbin/ldconfig
%description -n python3-tdb %description -n python3-tdb
This package contains the python3 bindings for the Tdb library. This package contains the Python3 bindings for the Tdb library.
%endif
%prep %prep
%setup -n tdb-%{version} -q %setup -n tdb-%{version} -q
@ -141,13 +117,7 @@ This package contains the python3 bindings for the Tdb library.
%patch1 -p1 %patch1 -p1
%build %build
%if 0%{?suse_version} && 0%{?suse_version} < 911 export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
OPTIMIZATION="-O"
%else
# use the default optimization
unset OPTIMIZATION
%endif
export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
CONFIGURE_OPTIONS="\ CONFIGURE_OPTIONS="\
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
@ -160,35 +130,25 @@ CONFIGURE_OPTIONS="\
%endif %endif
" "
./configure ${CONFIGURE_OPTIONS} ./configure ${CONFIGURE_OPTIONS}
%{__make} %{build_make_smp_mflags} \ make %{?_smp_mflags} \
all all
doxygen doxy.config doxygen doxy.config
%check %check
%if 0%{!?qemu_user_space_build:1} %if 0%{!?qemu_user_space_build:1}
%{__make} test make test
%endif %endif
%install %install
DESTDIR=${RPM_BUILD_ROOT} make install %make_install
# Install API documentation # Install API documentation
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3/ mkdir -p %{buildroot}/%{_mandir}/man3/
cp -a docs/man/man3/tdb.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ cp -a docs/man/man3/tdb.3 %{buildroot}/%{_mandir}/man3/
%post -n libtdb1 -p /sbin/ldconfig %post -n libtdb1 -p /sbin/ldconfig
%postun -n libtdb1 -p /sbin/ldconfig %postun -n libtdb1 -p /sbin/ldconfig
%post -n python-tdb -p /sbin/ldconfig
%postun -n python-tdb -p /sbin/ldconfig
%if %{with_python3}
%post -n python3-tdb -p /sbin/ldconfig
%postun -n python3-tdb -p /sbin/ldconfig
%endif
%files -n libtdb1 %files -n libtdb1
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libtdb.so.* %{_libdir}/libtdb.so.*
@ -206,12 +166,10 @@ cp -a docs/man/man3/tdb.3 $RPM_BUILD_ROOT/%{_mandir}/man3/
%{_bindir}/tdbdump %{_bindir}/tdbdump
%{_bindir}/tdbrestore %{_bindir}/tdbrestore
%{_bindir}/tdbtool %{_bindir}/tdbtool
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1100
%{_mandir}/man8/tdbbackup.8* %{_mandir}/man8/tdbbackup.8*
%{_mandir}/man8/tdbdump.8* %{_mandir}/man8/tdbdump.8*
%{_mandir}/man8/tdbrestore.8* %{_mandir}/man8/tdbrestore.8*
%{_mandir}/man8/tdbtool.8* %{_mandir}/man8/tdbtool.8*
%endif
%files -n python-tdb %files -n python-tdb
%defattr(-,root,root) %defattr(-,root,root)