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: 22-Jun-2007 20:44:54
Branch: HEAD Handle: 2007062219445400
Modified files:
openpkg-src/apr apr.patch apr.spec
Log:
upgrading package: apr 1.2.8 -> 1.2.9
Summary:
Revision Changes Path
1.8 +6 -6 openpkg-src/apr/apr.patch
1.43 +16 -11 openpkg-src/apr/apr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 apr.patch
--- openpkg-src/apr/apr.patch 22 Jun 2007 09:42:03 -0000 1.7
+++ openpkg-src/apr/apr.patch 22 Jun 2007 18:44:54 -0000 1.8
@@ -1,6 +1,6 @@
-Index: apu-config.in
---- apu-config.in.orig 2005-02-04 21:45:35 +0100
-+++ apu-config.in 2007-06-22 11:27:19 +0200
+Index: apr-util-1.2.8/apu-config.in
+--- apr-util-1.2.8/apu-config.in.orig 2005-02-04 21:45:35 +0100
++++ apr-util-1.2.8/apu-config.in 2007-06-22 20:21:09 +0200
@@ -27,7 +27,7 @@
libdir="@libdir@"
includedir="@includedir@"
@@ -10,9 +10,9 @@
INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"
-Index: crypto/getuuid.c
---- crypto/getuuid.c.orig 2006-04-14 20:01:58 +0200
-+++ crypto/getuuid.c 2007-06-22 11:27:08 +0200
+Index: apr-util-1.2.8/crypto/getuuid.c
+--- apr-util-1.2.8/crypto/getuuid.c.orig 2006-04-14 20:01:58 +0200
++++ apr-util-1.2.8/crypto/getuuid.c 2007-06-22 20:21:09 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 09:42:03 -0000 1.42
+++ openpkg-src/apr/apr.spec 22 Jun 2007 18:44:54 -0000 1.43
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_apr 1.2.9
+%define V_apr_util 1.2.8
+
# package information
Name: apr
Summary: Apache Portable Runtime
@@ -32,7 +36,7 @@
Class: PLUS
Group: Libraries
License: Apache
-Version: 1.2.8
+Version: %{V_apr}
Release: 20070622
# package options
@@ -42,8 +46,8 @@
%option with_ldap no
# list of sources
-Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
-Source1: http://www.apache.org/dist/apr/apr-util-%{version}.tar.gz
+Source0: http://www.apache.org/dist/apr/apr-%{V_apr}.tar.gz
+Source1: http://www.apache.org/dist/apr/apr-util-%{V_apr_util}.tar.gz
Patch0: apr.patch
# build information
@@ -75,12 +79,12 @@
%track
prog apr = {
- version = %{version}
+ version = %{V_apr}
url = http://www.apache.org/dist/apr/
regex = apr-(__VER__)\.tar\.gz
}
prog apr:apr-util = {
- version = %{version}
+ version = %{V_apr_util}
url = http://www.apache.org/dist/apr/
regex = apr-util-(__VER__)\.tar\.gz
}
@@ -88,10 +92,10 @@
%prep
%setup -q -c
%setup -q -D -T -a 1
- %patch -p0 -d apr-util-%{version}
+ %patch -p0
%build
- ( cd apr-%{version}
+ ( cd apr-%{V_apr}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
@@ -108,18 +112,18 @@
--disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
- ( cd apr-util-%{version}
+ ( cd apr-util-%{V_apr_util}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
%if "%{with_ldap}" == "yes"
LIBS="-lssl -lcrypto" \
%endif
./configure \
- --with-apr=`pwd`/../apr-%{version} \
--enable-layout=GNU \
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/apr \
--datadir=%{l_prefix}/share/apr \
+ --with-apr=`pwd`/../apr-%{V_apr} \
%if "%{with_db}" == "yes"
--with-dbm=db45 \
--with-berkeley-db=%{l_prefix} \
@@ -141,13 +145,14 @@
%install
rm -rf $RPM_BUILD_ROOT
- ( cd apr-%{version}
+ ( cd apr-%{V_apr}
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
- ( cd apr-util-%{version}
+ ( cd apr-util-%{V_apr_util}
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/aprutil.exp
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
