Tomohiro "Tomo-p" KATO 2 лет назад
Родитель
Сommit
c0be1399b9
1 измененных файлов с 24 добавлено и 7 удалено
  1. 24 7
      a/apr-util/apr-util-vl.spec

+ 24 - 7
a/apr-util/apr-util-vl.spec

@@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library
 Summary(ja): Apache ポータブルランタイムユーティリティライブラリ
 Name: apr-util
 Version: 1.6.1
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -13,6 +13,7 @@ License: Apache Software License 2.0
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
+Patch2: apr-util-1.6.1-r1894933.patch
 Patch4: apr-util-1.4.1-private.patch
 Patch5: apr-util-mariadb-upstream.patch
 
@@ -61,6 +62,16 @@ This package provides the PostgreSQL driver for the apr-util
 DBD (database abstraction) interface.
 
 
+%package bdb
+Summary: APR utility library Berkeley DB driver
+Group: system
+Requires: apr-util%{?_isa} = %{version}-%{release}
+
+%description bdb
+This package provides the Berkeley DB driver for the apr-util
+DBM (database abstraction) interface.
+
+
 %package mysql
 Summary: APR utility library MySQL DBD driver
 Group: system
@@ -110,18 +121,23 @@ Requires: apr-util = %{version}-%{release}
 This package provides the LDAP support for the apr-util.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
+%patch2 -p1 -b .r1894933
 %patch4 -p1 -b .private
 %patch5 -p1 -b .mariadb
 
 
 %build
 autoheader && autoconf
+export ac_cv_ldap_set_rebind_proc_style=three
 %configure --with-apr=%{_prefix} \
         --includedir=%{_includedir}/apr-%{apuver} \
-        --with-ldap=ldap_r --without-gdbm \
+        --with-ldap=ldap --without-gdbm \
         --with-sqlite3 --with-pgsql --with-mysql --with-odbc \
         --with-dbm=db5 --with-berkeley-db \
         --without-sqlite2 
@@ -177,17 +193,12 @@ export LD_LIBRARY_PATH="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$LD_LIBRA
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root,-)
 %license LICENSE
 %doc CHANGES NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
 %dir %{_libdir}/apr-util-%{apuver}
-%{_libdir}/apr-util-%{apuver}/apr_dbm_db*
 
 %files devel
 %defattr(-,root,root,-)
@@ -202,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql*
 
+%files bdb
+%{_libdir}/apr-util-%{apuver}/apr_dbm_db*
+
 %files mysql
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_mysql*
@@ -224,6 +238,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 11 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.1-3
+- dropped ldconfig scriptlets.
+
 * Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.1-2
 - rebuilt with current environment.