[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Sep-2009 10:58:49
Branch: HEAD Handle: 2009092509584900
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 1.3.8 -> 1.3.9
Summary:
RevisionChanges Path
1.69+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.68 -r1.69 apr.spec
--- openpkg-src/apr/apr.spec 6 Aug 2009 21:35:59 - 1.68
+++ openpkg-src/apr/apr.spec 25 Sep 2009 08:58:49 - 1.69
@@ -22,7 +22,7 @@
##
# package version
-%define V_apr 1.3.8
+%define V_apr 1.3.9
%define V_apr_util 1.3.9
# package information
@@ -36,7 +36,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20090806
+Release: 20090925
# package options
%option with_threads no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 24-Jul-2009 17:38:39
Branch: HEAD Handle: 2009072416383900
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 1.3.6 -> 1.3.7
Summary:
RevisionChanges Path
1.67+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.66 -r1.67 apr.spec
--- openpkg-src/apr/apr.spec 11 Jul 2009 15:10:48 - 1.66
+++ openpkg-src/apr/apr.spec 24 Jul 2009 15:38:39 - 1.67
@@ -22,7 +22,7 @@
##
# package version
-%define V_apr 1.3.6
+%define V_apr 1.3.7
%define V_apr_util 1.3.8
# package information
@@ -36,7 +36,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20090711
+Release: 20090724
# package options
%option with_threads no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 11-Jul-2009 17:10:48
Branch: HEAD Handle: 2009071116104800
Modified files:
openpkg-src/apr apr.spec
Log:
sed(1) is also required under 'run-time' because APR users call APR's
libtool and this in turn has sed(1) hard-coded
Summary:
RevisionChanges Path
1.66+3 -3 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.65 -r1.66 apr.spec
--- openpkg-src/apr/apr.spec 7 Jul 2009 20:46:33 - 1.65
+++ openpkg-src/apr/apr.spec 11 Jul 2009 15:10:48 - 1.66
@@ -36,7 +36,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20090707
+Release: 20090711
# package options
%option with_threads no
@@ -57,8 +57,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make, sed
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20040130, sed, make
+PreReq: OpenPKG, openpkg >= 20040130, sed
BuildPreReq: expat
PreReq: expat
%if "%{with_db}" == "yes"
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Jan-2009 09:53:53
Branch: HEAD Handle: 2009012508535200
Modified files:
openpkg-src/apr apr.spec
Log:
argl APR dislikes an explict disabling even more
Summary:
RevisionChanges Path
1.62+0 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.61 -r1.62 apr.spec
--- openpkg-src/apr/apr.spec 25 Jan 2009 08:52:16 - 1.61
+++ openpkg-src/apr/apr.spec 25 Jan 2009 08:53:52 - 1.62
@@ -178,8 +178,6 @@
--with-ldap \
--with-ldap-include=%{l_prefix}/include/ \
--with-ldap-lib=%{l_prefix}/lib \
-%else
- --without-ldap \
%endif
%if "%{with_odbc}" == "yes"
--with-odbc=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Jan-2009 09:52:16
Branch: HEAD Handle: 2009012508521600
Modified files:
openpkg-src/apr apr.spec
Log:
disable LDAP of not explicitly enabled to not pick it up by accident
Summary:
RevisionChanges Path
1.61+3 -1 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.60 -r1.61 apr.spec
--- openpkg-src/apr/apr.spec 24 Jan 2009 21:57:18 - 1.60
+++ openpkg-src/apr/apr.spec 25 Jan 2009 08:52:16 - 1.61
@@ -36,7 +36,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20090124
+Release: 20090125
# package options
%option with_threads no
@@ -178,6 +178,8 @@
--with-ldap \
--with-ldap-include=%{l_prefix}/include/ \
--with-ldap-lib=%{l_prefix}/lib \
+%else
+ --without-ldap \
%endif
%if "%{with_odbc}" == "yes"
--with-odbc=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 24-Jan-2009 22:57:18
Branch: HEAD Handle: 2009012421571800
Modified files:
openpkg-src/apr apr.spec
Log:
cleanup packaging
Summary:
RevisionChanges Path
1.60+0 -1 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.59 -r1.60 apr.spec
--- openpkg-src/apr/apr.spec 24 Jan 2009 21:52:18 - 1.59
+++ openpkg-src/apr/apr.spec 24 Jan 2009 21:57:18 - 1.60
@@ -128,7 +128,6 @@
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/apr \
--datadir=%{l_prefix}/share/apr \
- --disable-threads \
%if "%{with_threads}" == "yes"
--enable-threads \
%else
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 24-Jan-2009 22:52:18
Branch: HEAD Handle: 2009012421521800
Modified files:
openpkg-src/apr apr.spec
Log:
fix building of DBD DSOs and add ODBC support, too
Summary:
RevisionChanges Path
1.59+23 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.58 -r1.59 apr.spec
--- openpkg-src/apr/apr.spec 24 Jan 2009 21:32:38 - 1.58
+++ openpkg-src/apr/apr.spec 24 Jan 2009 21:52:18 - 1.59
@@ -44,6 +44,7 @@
%option with_gdbm no
%option with_iconvno
%option with_ldap no
+%option with_odbc no
%option with_pgsqlno
%option with_mysqlno
%option with_sqlite no
@@ -76,6 +77,10 @@
BuildPreReq: openldap, openssl >= 0.9.8
PreReq: openldap, openssl >= 0.9.8
%endif
+%if "%{with_odbc}" == "yes"
+BuildPreReq: ODBC
+PreReq: ODBC
+%endif
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
@@ -129,7 +134,8 @@
%else
--disable-threads \
%endif
- --disable-shared
+ --enable-shared \
+ --enable-static
%{l_make} %{l_mflags -O}
) || exit $?
( cd apr-util-%{V_apr_util}
@@ -174,16 +180,29 @@
--with-ldap-include=%{l_prefix}/include/ \
--with-ldap-lib=%{l_prefix}/lib \
%endif
+%if "%{with_odbc}" == "yes"
+ --with-odbc=%{l_prefix} \
+%else
+ --without-odbc \
+%endif
%if "%{with_pgsql}" == "yes"
--with-pgsql=%{l_prefix} \
+%else
+ --without-pgsql \
%endif
%if "%{with_mysql}" == "yes"
--with-mysql=%{l_prefix} \
+%else
+ --without-mysql \
%endif
%if "%{with_sqlite}" == "yes"
--with-sqlite3=%{l_prefix} \
+%else
+ --without-sqlite3 \
%endif
- --disable-shared
+ --enable-util-dso \
+ --enable-shared \
+ --enable-static
%{l_make} %{l_mflags -O}
) || exit $?
@@ -197,7 +216,9 @@
) || 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/apr-util-1/*.a
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
+rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so*
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 24-Jan-2009 22:32:39
Branch: HEAD Handle: 2009012421323800
Modified files:
openpkg-src/apr apr.spec
Log:
add optional support for PostgreSQL/MySQL/SQLite
Summary:
RevisionChanges Path
1.58+25 -1 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.57 -r1.58 apr.spec
--- openpkg-src/apr/apr.spec 1 Nov 2008 09:28:26 - 1.57
+++ openpkg-src/apr/apr.spec 24 Jan 2009 21:32:38 - 1.58
@@ -36,7 +36,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20081101
+Release: 20090124
# package options
%option with_threads no
@@ -44,6 +44,9 @@
%option with_gdbm no
%option with_iconvno
%option with_ldap no
+%option with_pgsqlno
+%option with_mysqlno
+%option with_sqlite no
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{V_apr}.tar.gz
@@ -73,6 +76,18 @@
BuildPreReq: openldap, openssl >= 0.9.8
PreReq: openldap, openssl >= 0.9.8
%endif
+%if "%{with_pgsql}" == "yes"
+BuildPreReq: postgresql
+PreReq: postgresql
+%endif
+%if "%{with_mysql}" == "yes"
+BuildPreReq: mysql
+PreReq: mysql
+%endif
+%if "%{with_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
+%endif
AutoReq: no
AutoReqProv: no
@@ -159,6 +174,15 @@
--with-ldap-include=%{l_prefix}/include/ \
--with-ldap-lib=%{l_prefix}/lib \
%endif
+%if "%{with_pgsql}" == "yes"
+ --with-pgsql=%{l_prefix} \
+%endif
+%if "%{with_mysql}" == "yes"
+ --with-mysql=%{l_prefix} \
+%endif
+%if "%{with_sqlite}" == "yes"
+ --with-sqlite3=%{l_prefix} \
+%endif
--disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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: 01-Nov-2008 10:28:26
Branch: HEAD Handle: 2008110109282600
Modified files:
openpkg-src/apr apr.spec
Log:
I don't see why sed(1) should be required under run-time, so remove it
there
Summary:
RevisionChanges Path
1.57+4 -4 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.56 -r1.57 apr.spec
--- openpkg-src/apr/apr.spec 16 Aug 2008 15:16:04 - 1.56
+++ openpkg-src/apr/apr.spec 1 Nov 2008 09:28:26 - 1.57
@@ -36,7 +36,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20080816
+Release: 20081101
# package options
%option with_threads no
@@ -53,10 +53,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, sed
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: expat, sed
-PreReq: expat, sed
+BuildPreReq: expat
+PreReq: expat
%if "%{with_db}" == "yes"
BuildPreReq: db >= 4.6
PreReq: db >= 4.6
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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: 21-Dec-2007 17:08:47
Branch: HEAD Handle: 2007122116084600
Modified files:
openpkg-src/apr apr.spec
Log:
adjust for DB 4.6
Summary:
RevisionChanges Path
1.52+4 -4 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.51 -r1.52 apr.spec
--- openpkg-src/apr/apr.spec 26 Nov 2007 08:16:52 - 1.51
+++ openpkg-src/apr/apr.spec 21 Dec 2007 16:08:46 - 1.52
@@ -37,7 +37,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20071126
+Release: 20071221
# package options
%option with_threads no
@@ -59,8 +59,8 @@
BuildPreReq: expat, sed
PreReq: expat, sed
%if "%{with_db}" == "yes"
-BuildPreReq: db
-PreReq: db
+BuildPreReq: db >= 4.6
+PreReq: db >= 4.6
%endif
%if "%{with_gdbm}" == "yes"
BuildPreReq: gdbm
@@ -143,7 +143,7 @@
--with-gdbm=%{l_prefix} \
%endif
%if "%{with_db}" == "yes"
- --with-dbm=db45 \
+ --with-dbm=db46 \
%else
%if "%{with_gdbm}" == "yes"
--with-dbm=gdbm \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Aug-2007 00:20:40
Branch: HEAD Handle: 2007073123203800
Modified files:
openpkg-src/apr apr.spec
Log:
fixate tool chain but avoid dependency to bash
Summary:
RevisionChanges Path
1.49+4 -3 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.48 -r1.49 apr.spec
--- openpkg-src/apr/apr.spec 25 Jun 2007 10:34:04 - 1.48
+++ openpkg-src/apr/apr.spec 31 Jul 2007 22:20:38 - 1.49
@@ -37,7 +37,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20070625
+Release: 20070801
# package options
%option with_threads no
@@ -56,8 +56,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: expat
-PreReq: expat
+BuildPreReq: expat, sed
+PreReq: expat, sed
%if "%{with_db}" == "yes"
BuildPreReq: db
PreReq: db
@@ -103,6 +103,7 @@
( cd apr-%{V_apr}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CONFIG_SHELL="/bin/sh" \
./configure \
--enable-layout=GNU \
--prefix=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jun-2007 12:34:04
Branch: HEAD Handle: 2007062511340400
Modified files:
openpkg-src/apr apr.spec
Log:
promote apr from PLUS to BASE as the BASE-classified apache package
(Apache HTTP 2.2) depends on it
Summary:
RevisionChanges Path
1.48+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.47 -r1.48 apr.spec
--- openpkg-src/apr/apr.spec 23 Jun 2007 13:20:43 - 1.47
+++ openpkg-src/apr/apr.spec 25 Jun 2007 10:34:04 - 1.48
@@ -33,11 +33,11 @@
Vendor: Apache Software Foundation
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
-Class:PLUS
+Class:BASE
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20070623
+Release: 20070625
# package options
%option with_threads no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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: 23-Jun-2007 15:20:43
Branch: HEAD Handle: 2007062314204300
Modified files:
openpkg-src/apr apr.spec
Log:
explicitly disable iconv support if not requested (we have to use
config.cache as --without-iconv is not supported correctly) in order
to avoid build failures for Apache. Reason: if iconv is not requested,
but libiconv is installed in instance and as present in the system
libc (e.g. Linux glibc), then APR would find that iconv is usable
(without even linking against -liconv) but unfortunately this fails
because it will pick up the instance iconv.h which maps iconv_xxx to
libiconv_xxx
Summary:
RevisionChanges Path
1.47+7 -1 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.46 -r1.47 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 21:25:13 - 1.46
+++ openpkg-src/apr/apr.spec 23 Jun 2007 13:20:43 - 1.47
@@ -37,7 +37,7 @@
Group:Libraries
License: Apache
Version: %{V_apr}
-Release: 20070622
+Release: 20070623
# package options
%option with_threads no
@@ -118,12 +118,18 @@
%{l_make} %{l_mflags -O}
) || exit $?
( cd apr-util-%{V_apr_util}
+ cp /dev/null config.cache
+%if "%{with_iconv}" == "no"
+ ( echo "ac_cv_header_iconv_h=no"
+ ) >config.cache
+%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
%if "%{with_ldap}" == "yes"
LIBS="-lssl -lcrypto" \
%endif
./configure \
+ --cache-file=./config.cache \
--enable-layout=GNU \
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/apr \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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 23:25:13
Branch: HEAD Handle: 200706251300
Modified files:
openpkg-src/apr apr.spec
Log:
Although the code is able to build against multiple DBM libs, the APR
Autoconf glue is not clever enough. It insists that if one builds with
Berkeley-DB it also has to be the default: So choose DB, then GDBM,
then SDBM as the default (in this order)
Summary:
RevisionChanges Path
1.46+8 -0 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.45 -r1.46 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 19:28:04 - 1.45
+++ openpkg-src/apr/apr.spec 22 Jun 2007 21:25:13 - 1.46
@@ -135,7 +135,15 @@
%if "%{with_gdbm}" == "yes"
--with-gdbm=%{l_prefix} \
%endif
+%if "%{with_db}" == "yes"
+ --with-dbm=db45 \
+%else
+%if "%{with_gdbm}" == "yes"
+ --with-dbm=gdbm \
+%else
--with-dbm=sdbm \
+%endif
+%endif
--with-expat=%{l_prefix} \
%if "%{with_iconv}" == "yes"
--with-iconv=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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 21:28:04
Branch: HEAD Handle: 2007062220280400
Modified files:
openpkg-src/apr apr.spec
Log:
check for default last
Summary:
RevisionChanges Path
1.45+1 -1 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.44 -r1.45 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 19:26:12 - 1.44
+++ openpkg-src/apr/apr.spec 22 Jun 2007 19:28:04 - 1.45
@@ -129,13 +129,13 @@
--includedir=%{l_prefix}/include/apr \
--datadir=%{l_prefix}/share/apr \
--with-apr=`pwd`/../apr-%{V_apr} \
- --with-dbm=sdbm \
%if "%{with_db}" == "yes"
--with-berkeley-db=%{l_prefix} \
%endif
%if "%{with_gdbm}" == "yes"
--with-gdbm=%{l_prefix} \
%endif
+ --with-dbm=sdbm \
--with-expat=%{l_prefix} \
%if "%{with_iconv}" == "yes"
--with-iconv=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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 11:17:38
Branch: HEAD Handle: 2007062210173800
Modified files:
openpkg-src/apr apr.spec
Log:
remove Apache 2 conflict marker, fix building against Berkeley-DB and
add iconv support
Summary:
RevisionChanges Path
1.41+5 -3 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.40 -r1.41 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 09:01:11 - 1.40
+++ openpkg-src/apr/apr.spec 22 Jun 2007 09:17:38 - 1.41
@@ -48,11 +48,10 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: db, expat
-PreReq: db, expat
+BuildPreReq: db, expat, libiconv
+PreReq: db, expat, libiconv
AutoReq: no
AutoReqProv: no
-Conflicts:apache2
%description
Apache Portable Runtime (APR) is a library of C data structures
@@ -103,7 +102,10 @@
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/apr \
--datadir=%{l_prefix}/share/apr \
+ --with-dbm=db45 \
+ --with-berkeley-db=%{l_prefix} \
--with-expat=%{l_prefix} \
+ --with-iconv=%{l_prefix}
--disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Sep-2006 18:14:29
Branch: HEAD Handle: 2006091317142900
Modified files:
openpkg-src/apr apr.spec
Log:
needs libexpat, would pick it up somewhere or use builtin, if not
found
Summary:
RevisionChanges Path
1.35+3 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.34 -r1.35 apr.spec
--- openpkg-src/apr/apr.spec 13 Sep 2006 12:48:34 - 1.34
+++ openpkg-src/apr/apr.spec 13 Sep 2006 16:14:29 - 1.35
@@ -48,8 +48,8 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: db
-PreReq: db
+BuildPreReq: db, expat
+PreReq: db, expat
AutoReq: no
AutoReqProv: no
Conflicts:apache2
@@ -101,6 +101,7 @@
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/apr \
--enable-layout=GNU \
+ --with-expat=%{l_prefix} \
--disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Sep-2006 14:48:34
Branch: HEAD Handle: 2006091313483400
Modified files:
openpkg-src/apr apr.spec
Log:
add optional thread support
Summary:
RevisionChanges Path
1.34+8 -0 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.33 -r1.34 apr.spec
--- openpkg-src/apr/apr.spec 13 Sep 2006 12:38:17 - 1.33
+++ openpkg-src/apr/apr.spec 13 Sep 2006 12:48:34 - 1.34
@@ -35,6 +35,9 @@
Version: 1.2.7
Release: 20060913
+# package options
+%option with_threads 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
@@ -82,6 +85,11 @@
--includedir=%{l_prefix}/include/apr \
--enable-layout=GNU \
--disable-threads \
+%if "%{with_threads}" == "yes"
+ --enable-threads \
+%else
+ --disable-threads \
+%endif
--disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Torsten Homeyer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 13-Sep-2006 14:38:18 Branch: HEAD Handle: 2006091313381700 Modified files: openpkg-src/apr apr.spec Log: revoked conflict subversion Summary: RevisionChanges Path 1.33+1 -1 openpkg-src/apr/apr.spec patch -p0 <<'@@ .' Index: openpkg-src/apr/apr.spec $ cvs diff -u -r1.32 -r1.33 apr.spec --- openpkg-src/apr/apr.spec 13 Sep 2006 11:44:05 - 1.32 +++ openpkg-src/apr/apr.spec 13 Sep 2006 12:38:17 - 1.33 @@ -49,7 +49,7 @@ PreReq: db AutoReq: no AutoReqProv: no -Conflicts:apache2, subversion +Conflicts:apache2 %description Apache Portable Runtime (APR) is a library of C data structures @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Sep-2006 13:44:05
Branch: HEAD Handle: 2006091312440500
Modified files:
openpkg-src/apr apr.spec
Log:
at least tomcat native needs the files in build and share. There is a
conflicting file with subversion, as subversion seems to carry some
parts of the Apache2 apr aswell
Summary:
RevisionChanges Path
1.32+2 -4 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.31 -r1.32 apr.spec
--- openpkg-src/apr/apr.spec 14 Apr 2006 08:17:41 - 1.31
+++ openpkg-src/apr/apr.spec 13 Sep 2006 11:44:05 - 1.32
@@ -33,7 +33,7 @@
Group:System
License: Apache
Version: 1.2.7
-Release: 20060414
+Release: 20060913
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ -49,7 +49,7 @@
PreReq: db
AutoReq: no
AutoReqProv: no
-Conflicts:apache2
+Conflicts:apache2, subversion
%description
Apache Portable Runtime (APR) is a library of C data structures
@@ -105,8 +105,6 @@
( cd apr-util-%{version}
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
-rm -rf $RPM_BUILD_ROOT%{l_prefix}/build
-rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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: 24-Mar-2006 08:58:25
Branch: HEAD Handle: 2006032407582500
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 1.2.2 -> 1.2.6
Summary:
RevisionChanges Path
1.29+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.28 -r1.29 apr.spec
--- openpkg-src/apr/apr.spec 1 Jan 2006 13:11:59 - 1.28
+++ openpkg-src/apr/apr.spec 24 Mar 2006 07:58:25 - 1.29
@@ -32,8 +32,8 @@
Class:PLUS
Group:System
License: Apache
-Version: 1.2.2
-Release: 20051012
+Version: 1.2.6
+Release: 20060324
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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: 12-Oct-2005 08:34:51
Branch: HEAD Handle: 2005101207345000
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 1.2.1 -> 1.2.2
Summary:
RevisionChanges Path
1.27+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.26 -r1.27 apr.spec
--- openpkg-src/apr/apr.spec 18 Aug 2005 18:30:52 - 1.26
+++ openpkg-src/apr/apr.spec 12 Oct 2005 06:34:50 - 1.27
@@ -32,8 +32,8 @@
Class:PLUS
Group:System
License: Apache
-Version: 1.2.1
-Release: 20050818
+Version: 1.2.2
+Release: 20051012
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Aug-2005 20:30:52
Branch: HEAD Handle: 2005081819305200
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 1.1.1 -> 1.2.1
Summary:
RevisionChanges Path
1.26+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.25 -r1.26 apr.spec
--- openpkg-src/apr/apr.spec 24 Mar 2005 11:18:25 - 1.25
+++ openpkg-src/apr/apr.spec 18 Aug 2005 18:30:52 - 1.26
@@ -32,8 +32,8 @@
Class:PLUS
Group:System
License: Apache
-Version: 1.1.1
-Release: 20050317
+Version: 1.2.1
+Release: 20050818
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
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: 17-Mar-2005 08:40:20
Branch: HEAD Handle: 2005031707402000
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 1.1.0 -> 1.1.1
Summary:
RevisionChanges Path
1.24+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.23 -r1.24 apr.spec
--- openpkg-src/apr/apr.spec 27 Jan 2005 15:52:02 - 1.23
+++ openpkg-src/apr/apr.spec 17 Mar 2005 07:40:20 - 1.24
@@ -33,8 +33,8 @@
Class:PLUS
Group:System
License: Apache
-Version: 1.1.0
-Release: 20050127
+Version: 1.1.1
+Release: 20050317
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Herbert Schmid
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jan-2005 16:52:03
Branch: HEAD Handle: 2005012715520200
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 1.0.1 -> 1.1.0
Summary:
RevisionChanges Path
1.23+2 -4 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.22 -r1.23 apr.spec
--- openpkg-src/apr/apr.spec 1 Jan 2005 10:47:49 - 1.22
+++ openpkg-src/apr/apr.spec 27 Jan 2005 15:52:02 - 1.23
@@ -33,12 +33,11 @@
Class:PLUS
Group:System
License: Apache
-Version: 1.0.1
-Release: 20041119
+Version: 1.1.0
+Release: 20050127
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
-Patch0: apr.patch
# build information
Prefix: %{l_prefix}
@@ -65,7 +64,6 @@
%prep
%setup -q
-%patch -p0
%build
CC="%{l_cc}" \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Nov-2004 09:52:28
Branch: HEAD Handle: 2004111908522800
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 1.0.0 -> 1.0.1
Summary:
RevisionChanges Path
1.21+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.20 -r1.21 apr.spec
--- openpkg-src/apr/apr.spec 8 Sep 2004 09:58:03 - 1.20
+++ openpkg-src/apr/apr.spec 19 Nov 2004 08:52:28 - 1.21
@@ -33,8 +33,8 @@
Class:PLUS
Group:System
License: Apache
-Version: 1.0.0
-Release: 20040908
+Version: 1.0.1
+Release: 20041119
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/apr/ apr.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Sep-2004 09:30:51
Branch: HEAD Handle: 2004090208305100
Modified files:
openpkg-src/apr apr.spec
Log:
upgrading package: apr 0.9.4 -> 1.0.0
Summary:
RevisionChanges Path
1.19+2 -2 openpkg-src/apr/apr.spec
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
$ cvs diff -u -r1.18 -r1.19 apr.spec
--- openpkg-src/apr/apr.spec 7 Feb 2004 17:53:28 - 1.18
+++ openpkg-src/apr/apr.spec 2 Sep 2004 07:30:51 - 1.19
@@ -33,8 +33,8 @@
Class:PLUS
Group:System
License: Apache
-Version: 0.9.4
-Release: 20040207
+Version: 1.0.0
+Release: 20040902
# list of sources
Source0: http://www.apache.org/dist/apr/apr-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
