OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jun-2008 23:54:23
Branch: HEAD Handle: 2008060722542100
Modified files:
openpkg-src/libdbi libdbi.patch libdbi.spec
Log:
upgrading package: libdbi 0.8.2 -> 0.8.3
Summary:
Revision Changes Path
1.3 +20 -8 openpkg-src/libdbi/libdbi.patch
1.17 +5 -7 openpkg-src/libdbi/libdbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libdbi/libdbi.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 libdbi.patch
--- openpkg-src/libdbi/libdbi.patch 23 Feb 2007 07:51:02 -0000 1.2
+++ openpkg-src/libdbi/libdbi.patch 7 Jun 2008 21:54:21 -0000 1.3
@@ -1,7 +1,19 @@
-Index: libdbi-0.8.2/configure
---- libdbi-0.8.2/configure.orig 2005-09-28 21:01:35 +0200
-+++ libdbi-0.8.2/configure 2005-10-11 08:43:10 +0200
-@@ -19221,41 +19221,6 @@
+Index: libdbi-0.8.3/Makefile.in
+--- libdbi-0.8.3/Makefile.in.orig 2008-02-06 20:40:10 +0100
++++ libdbi-0.8.3/Makefile.in 2008-02-07 19:55:51 +0100
+@@ -180,7 +180,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign dist-zip
+-SUBDIRS = src include @docs_subdirs@
++SUBDIRS = src include
+ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32
README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh
drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README
drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c
drivers/example/dbd_example.h drivers/example/dbd_example.sgml
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+Index: libdbi-0.8.3/configure
+--- libdbi-0.8.3/configure.orig 2008-02-06 20:40:11 +0100
++++ libdbi-0.8.3/configure 2008-02-07 19:29:13 +0100
+@@ -19234,41 +19234,6 @@
@@ -43,10 +55,10 @@
-Index: libdbi-drivers-0.8.2-1/configure
---- libdbi-drivers-0.8.2-1/configure.orig 2005-09-20 20:45:26 +0200
-+++ libdbi-drivers-0.8.2-1/configure 2005-10-11 08:42:04 +0200
-@@ -19247,42 +19247,6 @@
+Index: libdbi-drivers-0.8.3-1/configure
+--- libdbi-drivers-0.8.3-1/configure.orig 2008-02-06 20:41:47 +0100
++++ libdbi-drivers-0.8.3-1/configure 2008-02-07 19:29:13 +0100
+@@ -19509,42 +19509,6 @@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libdbi/libdbi.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 libdbi.spec
--- openpkg-src/libdbi/libdbi.spec 1 Jan 2008 14:56:43 -0000 1.16
+++ openpkg-src/libdbi/libdbi.spec 7 Jun 2008 21:54:21 -0000 1.17
@@ -22,8 +22,8 @@
##
# package version
-%define V_dbi 0.8.2
-%define V_dbi_drivers 0.8.2-1
+%define V_dbi 0.8.3
+%define V_dbi_drivers 0.8.3-1
# package information
Name: libdbi
@@ -36,7 +36,7 @@
Group: Database
License: LGPL
Version: %{V_dbi}
-Release: 20080101
+Release: 20080607
# package options
%option with_sqlite yes
@@ -120,6 +120,7 @@
./configure \
--prefix=%{l_prefix} \
--with-dbi-incdir=`pwd`/../libdbi-%{V_dbi}/include \
+ --with-dbi-libdir=`pwd`/../libdbi-%{V_dbi}/src \
%if "%{with_sqlite}" == "yes"
--with-sqlite3 \
--with-sqlite3-dir=%{l_prefix} \
@@ -149,15 +150,12 @@
$RPM_BUILD_ROOT%{l_prefix}/share/libdbi
( cd libdbi-[0-9]*
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- mv $RPM_BUILD_ROOT%{l_prefix}/share/doc/libdbi-*/*.pdf \
- $RPM_BUILD_ROOT%{l_prefix}/share/libdbi/
) || exit $?
( cd libdbi-drivers-*
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- mv $RPM_BUILD_ROOT%{l_prefix}/share/doc/libdbi-drivers/*.pdf \
- $RPM_BUILD_ROOT%{l_prefix}/share/libdbi/
) || exit $?
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/libdbi
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
