diff --git a/tdb.changes b/tdb.changes index f9906ae..ef915fd 100644 --- a/tdb.changes +++ b/tdb.changes @@ -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 diff --git a/tdb.spec b/tdb.spec index ec1953c..d23bf81 100644 --- a/tdb.spec +++ b/tdb.spec @@ -25,20 +25,11 @@ %endif 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: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libxslt -%if 0%{?suse_version} > 1020 BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif BuildRequires: python-devel %if %{with_python3} BuildRequires: python3-devel @@ -48,7 +39,7 @@ Version: 1.3.15 Release: 0 Summary: Samba Trivial Database License: GPL-3.0+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Source: https://download.samba.org/pub/tdb/tdb-%{version}.tar.gz Source1: https://download.samba.org/pub/tdb/tdb-%{version}.tar.asc Source2: tdb.keyring @@ -58,22 +49,18 @@ Patch1: build_pie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %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 -internally to keep writers from trampling on each other. TDB is also extremely -small. - +internally to keep writers from trampling on each other. %package -n libtdb1 -Summary: Libraries and Header Files to Develop Programs with tdb1 Support +Summary: Samba Trivial Database Group: System/Libraries -PreReq: /sbin/ldconfig %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 -internally to keep writers from trampling on each other. TDB is also extremely -small. +internally to keep writers from trampling on each other. 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 Group: Development/Libraries/C and C++ Requires: libtdb1 = %{version} -%if 0%{?suse_version} > 1020 Requires: pkg-config -%else -Requires: pkgconfig -%endif %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 -internally to keep writers from trampling on each other. TDB is also extremely -small. +internally to keep writers from trampling on each other. 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++ %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 -internally to keep writers from trampling on each other. TDB is also extremely -small. +internally to keep writers from trampling on each other. This package contains tools to manage Tdb files. @@ -115,23 +96,18 @@ Summary: Python bindings for the Tdb library Group: Development/Libraries/Python Requires: libtdb1 = %{version} Conflicts: python3-tdb -PreReq: /sbin/ldconfig %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 Summary: Python3 bindings for the Tdb library Group: Development/Libraries/Python Requires: libtdb1 = %{version} Conflicts: python-tdb -PreReq: /sbin/ldconfig %description -n python3-tdb -This package contains the python3 bindings for the Tdb library. -%endif +This package contains the Python3 bindings for the Tdb library. %prep %setup -n tdb-%{version} -q @@ -141,13 +117,7 @@ This package contains the python3 bindings for the Tdb library. %patch1 -p1 %build -%if 0%{?suse_version} && 0%{?suse_version} < 911 - 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" +export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -160,35 +130,25 @@ CONFIGURE_OPTIONS="\ %endif " ./configure ${CONFIGURE_OPTIONS} -%{__make} %{build_make_smp_mflags} \ +make %{?_smp_mflags} \ all doxygen doxy.config %check %if 0%{!?qemu_user_space_build:1} -%{__make} test +make test %endif %install -DESTDIR=${RPM_BUILD_ROOT} make install +%make_install # Install API documentation -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3/ -cp -a docs/man/man3/tdb.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ +mkdir -p %{buildroot}/%{_mandir}/man3/ +cp -a docs/man/man3/tdb.3 %{buildroot}/%{_mandir}/man3/ %post -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 %defattr(-,root,root) %{_libdir}/libtdb.so.* @@ -206,12 +166,10 @@ cp -a docs/man/man3/tdb.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ %{_bindir}/tdbdump %{_bindir}/tdbrestore %{_bindir}/tdbtool -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1100 %{_mandir}/man8/tdbbackup.8* %{_mandir}/man8/tdbdump.8* %{_mandir}/man8/tdbrestore.8* %{_mandir}/man8/tdbtool.8* -%endif %files -n python-tdb %defattr(-,root,root)