rpms/apr-util/devel .cvsignore, 1.8, 1.9 apr-util-1.2.8-dbddso.patch, 1.4, 1.5 apr-util.spec, 1.43, 1.44 sources, 1.10, 1.11 apr_dbd_mysql.c, 1.2, NONE
Bojan Smojver (bojan)
fedora-extras-commits at redhat.com
Mon Nov 26 22:51:11 UTC 2007
Author: bojan
Update of /cvs/pkgs/rpms/apr-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv328
Modified Files:
.cvsignore apr-util-1.2.8-dbddso.patch apr-util.spec sources
Removed Files:
apr_dbd_mysql.c
Log Message:
Bump up to 1.2.12
Drop MySQL DBD driver, shipped upstream
Adjust various patches to apply
Rework tests in %check (1.2.x got tests from trunk)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 11 Sep 2007 09:50:55 -0000 1.8
+++ .cvsignore 26 Nov 2007 22:50:36 -0000 1.9
@@ -1 +1 @@
-apr-util-1.2.10.tar.bz2
+apr-util-1.2.12.tar.bz2
apr-util-1.2.8-dbddso.patch:
Index: apr-util-1.2.8-dbddso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util-1.2.8-dbddso.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apr-util-1.2.8-dbddso.patch 11 Sep 2007 09:50:55 -0000 1.4
+++ apr-util-1.2.8-dbddso.patch 26 Nov 2007 22:50:36 -0000 1.5
@@ -1,6 +1,6 @@
--- apr-util-1.2.8/build-outputs.mk.dbddso
+++ apr-util-1.2.8/build-outputs.mk
-@@ -1,52 +1,49 @@
+@@ -1,53 +1,49 @@
# DO NOT EDIT. AUTOMATICALLY GENERATED.
-buckets/apr_buckets_pipe.lo: buckets/apr_buckets_pipe.c .make.dirs include/apr_buckets.h
@@ -45,6 +45,7 @@
-strmatch/apr_strmatch.lo: strmatch/apr_strmatch.c .make.dirs include/apr_strmatch.h
-xlate/xlate.lo: xlate/xlate.c .make.dirs include/apr_xlate.h
-dbd/apr_dbd.lo: dbd/apr_dbd.c .make.dirs include/apr_dbd.h
+-dbd/apr_dbd_mysql.lo: dbd/apr_dbd_mysql.c .make.dirs include/apu_version.h include/apr_buckets.h
-dbd/apr_dbd_sqlite2.lo: dbd/apr_dbd_sqlite2.c .make.dirs
-dbd/apr_dbd_sqlite3.lo: dbd/apr_dbd_sqlite3.c .make.dirs
-dbd/apr_dbd_pgsql.lo: dbd/apr_dbd_pgsql.c .make.dirs
@@ -91,7 +92,7 @@
+xlate/xlate.lo: xlate/xlate.c .make.dirs include/apu.h include/private/apu_config.h include/apr_xlate.h
+dbd/apr_dbd.lo: dbd/apr_dbd.c .make.dirs include/private/apu_config.h include/private/apr_dbd_internal.h include/apu.h include/apu_version.h include/apr_dbd.h
--OBJECTS_all = buckets/apr_buckets_pipe.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_socket.lo buckets/apr_buckets_heap.lo buckets/apr_buckets_simple.lo buckets/apr_buckets_file.lo buckets/apr_buckets.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_eos.lo buckets/apr_brigade.lo buckets/apr_buckets_refcount.lo crypto/apr_sha1.lo crypto/uuid.lo crypto/getuuid.lo crypto/apr_md5.lo crypto/apr_md4.lo dbm/apr_dbm.lo dbm/apr_dbm_berkeleydb.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm_pair.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm_lock.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_url.lo ldap/apr_ldap_option.lo ldap/apr_ldap_init.lo misc/apr_reslist.lo misc/apu_version.lo misc/apr_date.lo misc/apr_rmm.lo misc/apr_queue.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd.lo dbd/apr_dbd_sqlite2.lo dbd/apr_dbd_sqlite3.lo dbd/apr!
_dbd_pgsql.lo
+-OBJECTS_all = buckets/apr_buckets_pipe.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_socket.lo buckets/apr_buckets_heap.lo buckets/apr_buckets_simple.lo buckets/apr_buckets_file.lo buckets/apr_buckets.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_eos.lo buckets/apr_brigade.lo buckets/apr_buckets_refcount.lo crypto/apr_sha1.lo crypto/uuid.lo crypto/getuuid.lo crypto/apr_md5.lo crypto/apr_md4.lo dbm/apr_dbm.lo dbm/apr_dbm_berkeleydb.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm_pair.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm_lock.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_url.lo ldap/apr_ldap_option.lo ldap/apr_ldap_init.lo misc/apr_reslist.lo misc/apu_version.lo misc/apr_date.lo misc/apr_rmm.lo misc/apr_queue.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd.lo dbd/apr_dbd_mysql.lo dbd/apr_dbd_sqlite2.lo dbd/apr_d!
bd_sqlite3.lo dbd/apr_dbd_pgsql.lo
+OBJECTS_all = buckets/apr_buckets_socket.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_eos.lo buckets/apr_buckets_file.lo buckets/apr_buckets_pipe.lo buckets/apr_buckets_refcount.lo buckets/apr_brigade.lo buckets/apr_buckets.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_simple.lo buckets/apr_buckets_heap.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_alloc.lo crypto/apr_md4.lo crypto/getuuid.lo crypto/apr_md5.lo crypto/uuid.lo crypto/apr_sha1.lo dbm/apr_dbm_sdbm.lo dbm/apr_dbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_berkeleydb.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm_lock.lo dbm/sdbm/sdbm_pair.lo dbm/sdbm/sdbm.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_url.lo ldap/apr_ldap_init.lo ldap/apr_ldap_option.lo misc/apr_date.lo misc/apr_rmm.lo misc/apr_reslist.lo misc/apu_version.lo misc/apr_queue.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd.lo
OBJECTS_unix = $(OBJECTS_all)
@@ -424,37 +425,14 @@
])
dnl
AC_DEFUN([APU_CHECK_DBD_MYSQL], [
-@@ -101,7 +102,6 @@
- else
- if test "x$MYSQL_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-- APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
- fi
- fi
-
-@@ -129,14 +129,12 @@
- AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
- if test "$apu_have_mysql" != "0"; then
- APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-- APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
- fi
-
- if test "$apu_have_mysql" != "1"; then
- AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
- if test "$apu_have_mysql" != "0"; then
- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
-- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
- fi
- fi
-
-@@ -163,7 +161,6 @@
+@@ -122,7 +121,6 @@
+ AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
if test "$apu_have_mysql" != "0"; then
- if test "x$MYSQL_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-- APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
- fi
+ APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
+- APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
fi
+ if test "$apu_have_mysql" != "1"; then
@@ -177,8 +174,9 @@
dnl Since we have already done the AC_CHECK_LIB tests, if we have it,
dnl we know the library is there.
Index: apr-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- apr-util.spec 24 Sep 2007 18:07:19 -0000 1.43
+++ apr-util.spec 26 Nov 2007 22:50:36 -0000 1.44
@@ -3,13 +3,12 @@
Summary: Apache Portable Runtime Utility library
Name: apr-util
-Version: 1.2.10
-Release: 2%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
License: ASL 2.0
Group: System Environment/Libraries
URL: http://apr.apache.org/
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-Source1: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.2.x/dbd/apr_dbd_mysql.c
Patch0: apr-util-1.2.2-exports.patch
Patch2: apr-util-1.2.7-pkgconf.patch
Patch3: apr-util-1.2.8-dbddso.patch
@@ -71,8 +70,6 @@
%patch2 -p1 -b .pkgconf
%patch3 -p1 -b .dbddso
-cp $RPM_SOURCE_DIR/apr_dbd_mysql.c dbd
-
%build
autoheader && autoconf
%configure --with-apr=%{_prefix} \
@@ -108,12 +105,11 @@
# Run the less verbose test suites
export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
cd test
-make %{?_smp_mflags} testall testrmm testdbm
+make %{?_smp_mflags} testall
# testall breaks with DBD DSO; ignore
./testall -v -q || true
-./testrmm
-./testdbm auto tsdbm
-./testdbm -tDB auto tbdb.db
+./testall testrmm
+./testall testdbm
%clean
rm -rf $RPM_BUILD_ROOT
@@ -149,6 +145,12 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Tue Nov 27 2007 Jesse Keating <jkeating at redhat.com> - 1.2.12-1
+- bump up to 1.2.12
+- drop MySQL DBD driver, shipped upstream
+- adjust various patches to apply
+- rework tests in %%check (1.2.x got tests from trunk)
+
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 1.2.10-2
- Rebuild for upgrade path (add dist since that's now on F-7 branch)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apr-util/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 11 Sep 2007 09:50:55 -0000 1.10
+++ sources 26 Nov 2007 22:50:36 -0000 1.11
@@ -1 +1 @@
-9277c21fe41065bd359db98c474aa998 apr-util-1.2.10.tar.bz2
+4ec0474c61113dcb57943916e7f53522 apr-util-1.2.12.tar.bz2
--- apr_dbd_mysql.c DELETED ---
More information about the fedora-extras-commits
mailing list