[CVS] OpenPKG: openpkg-src/postgresql7/ postgresql7.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: 08-Apr-2005 08:12:51
Branch: HEAD Handle: 2005040807125100
Modified files:
openpkg-src/postgresql7 postgresql7.spec
Log:
perl-openpkg is required under built-time only
Summary:
RevisionChanges Path
1.13+2 -2 openpkg-src/postgresql7/postgresql7.spec
patch -p0 '@@ .'
Index: openpkg-src/postgresql7/postgresql7.spec
$ cvs diff -u -r1.12 -r1.13 postgresql7.spec
--- openpkg-src/postgresql7/postgresql7.spec 24 Mar 2005 11:20:05 -
1.12
+++ openpkg-src/postgresql7/postgresql7.spec 8 Apr 2005 06:12:51 -
1.13
@@ -42,7 +42,7 @@
Group:Database
License: GPL
Version: %{V_postgresql}
-Release: 20050321
+Release: 20050408
# package options
%option with_server yes
@@ -75,7 +75,7 @@
PreReq: readline, zlib, openssl, getopt
%if %{with_perl} == yes
BuildPreReq: perl, perl-openpkg = 5.8.3-20040126
-PreReq: perl, perl-openpkg = 5.8.3-20040126
+PreReq: perl
%endif
%if %{with_odbc} == yes
BuildPreReq: unixodbc
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/skill/ skill.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: 08-Apr-2005 08:16:56
Branch: HEAD Handle: 2005040807165600
Modified files:
openpkg-src/skill skill.spec
Log:
upgrading package: skill 4.1.1 - 4.1.2
Summary:
RevisionChanges Path
1.20+2 -2 openpkg-src/skill/skill.spec
patch -p0 '@@ .'
Index: openpkg-src/skill/skill.spec
$ cvs diff -u -r1.19 -r1.20 skill.spec
--- openpkg-src/skill/skill.spec 24 Mar 2005 11:20:20 - 1.19
+++ openpkg-src/skill/skill.spec 8 Apr 2005 06:16:56 - 1.20
@@ -32,8 +32,8 @@
Class:BASE
Group:System
License: BSD
-Version: 4.1.1
-Release: 20040603
+Version: 4.1.2
+Release: 20050408
# list of sources
Source0: ftp://fast.cs.utah.edu/pub/skill/skill-%{version}.tgz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/dsh/ dsh.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: 08-Apr-2005 08:19:16
Branch: HEAD Handle: 2005040807191600
Modified files:
openpkg-src/dsh dsh.spec
Log:
upgrading package: dsh 0.25.5 - 0.25.6
Summary:
RevisionChanges Path
1.37+2 -2 openpkg-src/dsh/dsh.spec
patch -p0 '@@ .'
Index: openpkg-src/dsh/dsh.spec
$ cvs diff -u -r1.36 -r1.37 dsh.spec
--- openpkg-src/dsh/dsh.spec 24 Mar 2005 11:18:42 - 1.36
+++ openpkg-src/dsh/dsh.spec 8 Apr 2005 06:19:16 - 1.37
@@ -23,7 +23,7 @@
##
# package versions
-%define V_dsh 0.25.5
+%define V_dsh 0.25.6
%define V_dshconfig 0.20.11
# package information
@@ -37,7 +37,7 @@
Group:Shell
License: GPL
Version: %{V_dsh}
-Release: 20050316
+Release: 20050408
# list of sources
Source0:
http://www.netfort.gr.jp/~dancer/software/downloads/dsh-%{V_dsh}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/rdiff-backup/ rdiff-backup.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: 08-Apr-2005 08:19:17
Branch: HEAD Handle: 2005040807191700
Modified files:
openpkg-src/rdiff-backup
rdiff-backup.spec
Log:
upgrading package: rdiff-backup 0.13.5 - 0.13.6
Summary:
RevisionChanges Path
1.49+4 -4 openpkg-src/rdiff-backup/rdiff-backup.spec
patch -p0 '@@ .'
Index: openpkg-src/rdiff-backup/rdiff-backup.spec
$ cvs diff -u -r1.48 -r1.49 rdiff-backup.spec
--- openpkg-src/rdiff-backup/rdiff-backup.spec28 Mar 2005 17:57:30
- 1.48
+++ openpkg-src/rdiff-backup/rdiff-backup.spec8 Apr 2005 06:19:17
- 1.49
@@ -25,18 +25,18 @@
# package information
Name: rdiff-backup
Summary: Remote Incremental Backup
-URL: http://rdiff-backup.stanford.edu/
+URL: http://www.nongnu.org/rdiff-backup/
Vendor: Ben Escoto
Packager: OpenPKG
Distribution: OpenPKG
Class:PLUS
Group:Network
License: GPL
-Version: 0.13.5
-Release: 20050328
+Version: 0.13.6
+Release: 20050408
# list of sources
-Source0:
http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-%{version}.tar.gz
+Source0:
http://www.nongnu.org/rdiff-backup/rdiff-backup-%{version}.tar.gz
# build information
Prefix: %{l_prefix}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-util/ perl-util.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: 08-Apr-2005 08:19:20
Branch: HEAD Handle: 2005040807192000
Modified files:
openpkg-src/perl-util perl-util.spec
Log:
modifying package: perl-util-5.8.6 20050406 - 20050408
Summary:
RevisionChanges Path
1.182 +2 -2 openpkg-src/perl-util/perl-util.spec
patch -p0 '@@ .'
Index: openpkg-src/perl-util/perl-util.spec
$ cvs diff -u -r1.181 -r1.182 perl-util.spec
--- openpkg-src/perl-util/perl-util.spec 6 Apr 2005 06:16:29 -
1.181
+++ openpkg-src/perl-util/perl-util.spec 8 Apr 2005 06:19:20 -
1.182
@@ -78,7 +78,7 @@
%define V_regexp_shellish 0.93
%define V_contize 0.3
%define V_memoize 1.01
-%define V_path_class 0.09
+%define V_path_class 0.10
%define V_anydata 0.10
%define V_ootools 1.79
%define V_clone0.15
@@ -97,7 +97,7 @@
Group:Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20050406
+Release: 20050408
# list of sources
Source0:
http://www.cpan.org/modules/by-module/Test/Test-%{V_test}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bogofilter/ bogofilter.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: 08-Apr-2005 08:19:27
Branch: HEAD Handle: 2005040807192700
Modified files:
openpkg-src/bogofilter bogofilter.spec
Log:
upgrading package: bogofilter 0.94.3 - 0.94.4
Summary:
RevisionChanges Path
1.79+2 -2 openpkg-src/bogofilter/bogofilter.spec
patch -p0 '@@ .'
Index: openpkg-src/bogofilter/bogofilter.spec
$ cvs diff -u -r1.78 -r1.79 bogofilter.spec
--- openpkg-src/bogofilter/bogofilter.spec31 Mar 2005 07:18:27 -
1.78
+++ openpkg-src/bogofilter/bogofilter.spec8 Apr 2005 06:19:27 -
1.79
@@ -32,8 +32,8 @@
Class:BASE
Group:Text
License: GPL
-Version: 0.94.3
-Release: 20050331
+Version: 0.94.4
+Release: 20050408
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bogofilter/bogofilter-%{version}.tar.bz2
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/mplayer/ mplayer.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: 08-Apr-2005 08:22:46
Branch: HEAD Handle: 2005040807224600
Modified files:
openpkg-src/mplayer mplayer.spec
Log:
modifying package: mplayer-1.0pre6a 20050401 - 20050408
Summary:
RevisionChanges Path
1.119 +2 -2 openpkg-src/mplayer/mplayer.spec
patch -p0 '@@ .'
Index: openpkg-src/mplayer/mplayer.spec
$ cvs diff -u -r1.118 -r1.119 mplayer.spec
--- openpkg-src/mplayer/mplayer.spec 1 Apr 2005 06:17:40 - 1.118
+++ openpkg-src/mplayer/mplayer.spec 8 Apr 2005 06:22:46 - 1.119
@@ -25,7 +25,7 @@
# package versions
%define V_mplayer 1.0pre6a
%define V_blue1.4
-%define V_live2005.04.01
+%define V_live2005.04.07
# package information
Name: mplayer
@@ -38,7 +38,7 @@
Group:Video
License: GPL and others
Version: %{V_mplayer}
-Release: 20050401
+Release: 20050408
# build options
%option with_guiyes
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/postgresql/ postgresql.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: 08-Apr-2005 08:23:06
Branch: HEAD Handle: 2005040807230600
Modified files:
openpkg-src/postgresql postgresql.spec
Log:
upgrading package: postgresql 8.0.1 - 8.0.2
Summary:
RevisionChanges Path
1.150 +3 -3 openpkg-src/postgresql/postgresql.spec
patch -p0 '@@ .'
Index: openpkg-src/postgresql/postgresql.spec
$ cvs diff -u -r1.149 -r1.150 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec24 Mar 2005 11:20:05 -
1.149
+++ openpkg-src/postgresql/postgresql.spec8 Apr 2005 06:23:06 -
1.150
@@ -23,7 +23,7 @@
##
# package versions
-%define V_postgresql 8.0.1
+%define V_postgresql 8.0.2
%define V_libpqpp 4.0
%define V_libpqxx 2.5.0
%define V_pgperl 2.0.2
@@ -43,7 +43,7 @@
Group:Database
License: GPL
Version: %{V_postgresql}
-Release: 20050323
+Release: 20050408
# package options
%option with_serveryes
@@ -80,7 +80,7 @@
PreReq: readline, zlib, openssl, getopt
%if %{with_perl} == yes
BuildPreReq: perl, perl-openpkg = 5.8.3-20040126
-PreReq: perl, perl-openpkg = 5.8.3-20040126
+PreReq: perl
%endif
%if %{with_odbc} == yes
BuildPreReq: unixodbc
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cfengine/ cfengine.patch cfengine.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: 08-Apr-2005 09:01:21 Branch: HEAD Handle: 2005040808012100 Modified files: openpkg-src/cfenginecfengine.patch cfengine.spec Log: upgrading package: cfengine 2.1.13 - 2.1.14 Summary: RevisionChanges Path 1.10+6 -6 openpkg-src/cfengine/cfengine.patch 1.55+2 -2 openpkg-src/cfengine/cfengine.spec patch -p0 '@@ .' Index: openpkg-src/cfengine/cfengine.patch $ cvs diff -u -r1.9 -r1.10 cfengine.patch --- openpkg-src/cfengine/cfengine.patch 3 Aug 2004 17:15:39 - 1.9 +++ openpkg-src/cfengine/cfengine.patch 8 Apr 2005 07:01:21 - 1.10 @@ -1,16 +1,16 @@ Index: doc/Makefile.in doc/Makefile.in.orig 2004-04-09 23:16:46.0 +0200 -+++ doc/Makefile.in 2004-04-14 10:04:19.0 +0200 -@@ -73,7 +73,7 @@ +--- doc/Makefile.in.orig 2005-02-28 21:10:33 +0100 doc/Makefile.in 2005-04-08 08:59:54 +0200 +@@ -79,7 +79,7 @@ + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; docDATA_INSTALL = $(INSTALL_DATA) htmlDATA_INSTALL = $(INSTALL_DATA) - psDATA_INSTALL = $(INSTALL_DATA) --DATA = $(doc_DATA) $(html_DATA) $(ps_DATA) +-DATA = $(doc_DATA) $(html_DATA) +DATA = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ -@@ -666,7 +666,7 @@ +@@ -662,7 +662,7 @@ uninstall: uninstall-am install-am: all-am @@ . patch -p0 '@@ .' Index: openpkg-src/cfengine/cfengine.spec $ cvs diff -u -r1.54 -r1.55 cfengine.spec --- openpkg-src/cfengine/cfengine.spec24 Mar 2005 11:18:33 - 1.54 +++ openpkg-src/cfengine/cfengine.spec8 Apr 2005 07:01:21 - 1.55 @@ -34,8 +34,8 @@ Class:PLUS Group:System License: GPL -Version: 2.1.13 -Release: 20050221 +Version: 2.1.14 +Release: 20050408 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gnutls/ gnutls.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: 08-Apr-2005 11:34:27
Branch: HEAD Handle: 2005040810342700
Modified files:
openpkg-src/gnutls gnutls.spec
Log:
use different tarball because original one is no longer available
Summary:
RevisionChanges Path
1.63+3 -3 openpkg-src/gnutls/gnutls.spec
patch -p0 '@@ .'
Index: openpkg-src/gnutls/gnutls.spec
$ cvs diff -u -r1.62 -r1.63 gnutls.spec
--- openpkg-src/gnutls/gnutls.spec24 Mar 2005 11:18:57 - 1.62
+++ openpkg-src/gnutls/gnutls.spec8 Apr 2005 09:34:27 - 1.63
@@ -32,11 +32,11 @@
Class:PLUS
Group:Cryptography
License: GPL
-Version: 1.0.24
-Release: 20050125
+Version: 1.2.1
+Release: 20050408
# list of sources
-Source0: ftp://gnutls.hellug.gr/pub/gnutls/gnutls-%{version}.tar.gz
+Source0: ftp://gnutls.hellug.gr/pub/gnutls/gnutls-%{version}.tar.bz2
Patch0: gnutls.patch
# build information
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cvs/ cvs.patch cvs.patch.rse cvs.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: 08-Apr-2005 17:04:22
Branch: HEAD Handle: 2005040816042200
Modified files:
openpkg-src/cvs cvs.patch cvs.patch.rse cvs.spec
Log:
upgrading package: cvs 1.12.9 - 1.12.11
Summary:
RevisionChanges Path
1.6 +6 -6 openpkg-src/cvs/cvs.patch
1.17+323 -330 openpkg-src/cvs/cvs.patch.rse
1.97+3 -3 openpkg-src/cvs/cvs.spec
patch -p0 '@@ .'
Index: openpkg-src/cvs/cvs.patch
$ cvs diff -u -r1.5 -r1.6 cvs.patch
--- openpkg-src/cvs/cvs.patch 7 Jun 2004 14:46:39 - 1.5
+++ openpkg-src/cvs/cvs.patch 8 Apr 2005 15:04:22 - 1.6
@@ -1,17 +1,17 @@
--- src/main.c.orig Tue May 20 00:52:58 2003
+++ src/main.c Thu Jun 26 15:42:16 2003
-@@ -14,6 +14,10 @@
-
- #include assert.h
+@@ -16,6 +16,10 @@
#include cvs.h
+ #include xgethostname.h
+ #include strftime.h
+#if defined(SERVER_SUPPORT) defined(HAVE_SYSLOG_H)
+#include syslog.h
+#include stdarg.h
+#endif
- #ifdef HAVE_WINSOCK_H
- #include winsock.h
-@@ -424,6 +428,11 @@
+ const char *program_name;
+ const char *program_path;
+@@ -557,6 +561,11 @@
/* `getopt_long' stores the option index here, but right now we
don't use it. */
int option_index = 0;
@@ .
patch -p0 '@@ .'
Index: openpkg-src/cvs/cvs.patch.rse
$ cvs diff -u -r1.16 -r1.17 cvs.patch.rse
--- openpkg-src/cvs/cvs.patch.rse 13 Feb 2005 14:33:28 - 1.16
+++ openpkg-src/cvs/cvs.patch.rse 8 Apr 2005 15:04:22 - 1.17
@@ -323,11 +323,11 @@
Index: src/add.c
===
RCS file: /v/ossp/pkg/tool/cvs/cvs/cvs/src/add.c,v
-retrieving revision 1.1.1.12
-diff -u -d -r1.1.1.12 add.c
src/add.c8 May 2004 23:13:10 - 1.1.1.12
-+++ src/add.c19 May 2004 18:33:37 -
-@@ -829,6 +829,9 @@
+retrieving revision 1.1.1.13
+diff -u -d -r1.1.1.13 add.c
+--- src/add.c4 Nov 2004 15:15:26 - 1.1.1.13
src/add.c8 Apr 2005 09:42:35 -
+@@ -855,6 +855,9 @@
li-type = T_TITLE;
li-tag = xstrdup (tag);
li-rev_old = li-rev_new = NULL;
@@ -340,11 +340,11 @@
Index: src/admin.c
===
RCS file: /v/ossp/pkg/tool/cvs/cvs/cvs/src/admin.c,v
-retrieving revision 1.1.1.13
-diff -u -d -r1.1.1.13 admin.c
src/admin.c 22 Mar 2004 17:26:42 - 1.1.1.13
-+++ src/admin.c 14 Apr 2004 17:52:40 -
-@@ -137,6 +137,160 @@
+retrieving revision 1.1.1.14
+diff -u -d -r1.1.1.14 admin.c
+--- src/admin.c 4 Nov 2004 15:15:26 - 1.1.1.14
src/admin.c 8 Apr 2005 13:40:35 -
+@@ -135,6 +135,160 @@
dat-av[dat-ac++] = newelt;
}
@@ -354,7 +354,7 @@
+static List *admininfo_flist;
+
+static void admininfo_dlist_delproc (Node *);
-+static int admininfo_info_runproc (char *, char *, void *);
++static int admininfo_info_runproc (const char *, const char *, void *);
+static int admininfo_flist_runproc (Node *, void *);
+
+struct admininfo_dlist_st {
@@ -365,7 +365,7 @@
+static int
+admininfo_fileproc (void *callerdat, struct file_info *finfo)
+{
-+char *xdir;
++const char *xdir;
+Node *dnode;
+Node *fnode;
+
@@ -426,8 +426,8 @@
+admininfo_filesdoneproc(
+void *callerdat,
+int err,
-+char *repos,
-+char *update_dir,
++const char *repos,
++const char *update_dir,
+List *entries)
+{
+Node *dnode;
@@ -454,8 +454,8 @@
+/* admininfo configuration entry callback */
+static int
+admininfo_info_runproc(repository, filter, closure)
-+char *repository;
-+char *filter;
++const char *repository;
++const char *filter;
+void *closure;
+{
+char *s, *cp;
@@ -502,10 +502,10 @@
+
+#endif /* RSE_PATCH_ADMININFO */
+
- int
- admin (int argc, char **argv)
- {
-@@ -513,6 +667,20 @@
+
+
+ /*
+@@ -585,6 +739,20 @@
lock_tree_promotably (argc, argv, 0, W_LOCAL, 0);
@@ -524,15 +524,15 @@
+#endif
+
err = start_recursion
- (admin_fileproc, NULL, admin_dirproc,
+ (admin_fileproc, admin_filesdoneproc, admin_dirproc,
[CVS] OpenPKG: openpkg-src/pdnsd/ pdnsd.patch pdnsd.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: 08-Apr-2005 17:37:55
Branch: HEAD Handle: 2005040816375500
Modified files:
openpkg-src/pdnsd pdnsd.patch pdnsd.spec
Log:
upgrading package: pdnsd 1.2 - 1.2.2
Summary:
RevisionChanges Path
1.4 +84 -11 openpkg-src/pdnsd/pdnsd.patch
1.14+12 -8 openpkg-src/pdnsd/pdnsd.spec
patch -p0 '@@ .'
Index: openpkg-src/pdnsd/pdnsd.patch
$ cvs diff -u -r1.3 -r1.4 pdnsd.patch
--- openpkg-src/pdnsd/pdnsd.patch 16 Oct 2004 08:15:48 - 1.3
+++ openpkg-src/pdnsd/pdnsd.patch 8 Apr 2005 15:37:55 - 1.4
@@ -1,26 +1,99 @@
+Index: config.h.in
+--- config.h.in.orig 2005-04-03 18:05:55 +0200
config.h.in 2005-04-08 17:35:08 +0200
+@@ -183,6 +183,7 @@
+ #define TARGET_LINUX 0
+ #define TARGET_BSD1
+ #define TARGET_CYGWIN 2
++#define TARGET_SOLARIS 3
+
+ /* Allow _ in domain names? (This option is obsolete and will be ignored.)
*/
+ #undef UNDERSCORE
+Index: configure
+--- configure.orig 2005-04-03 18:05:58 +0200
configure2005-04-08 17:34:38 +0200
+@@ -1116,6 +1116,14 @@
+ s/'''/'''''/g;
+
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='''\\2'''/p
+ ;;
++SunOS)
++ echo $ac_t${uname_sys} 16
++ cat confdefs.h \EOF
++#define TARGET TARGET_SOLARIS
++EOF
++
++ target=BSD
++ ;;
+ *)
+ sed -n \
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p
+@@ -6034,7 +6042,7 @@
+
+
+
+-for ac_func in nanosleep gettimeofday mkfifo select socket strerror uname
snprintf vsnprintf
++for ac_func in gettimeofday mkfifo select socket strerror uname snprintf
vsnprintf
+ do
+ as_ac_var=`echo ac_cv_func_$ac_func | $as_tr_sh`
+ echo $as_me:$LINENO: checking for $ac_func 5
Index: src/conff.h
src/conff.h.orig 2004-08-10 17:48:46 +0200
-+++ src/conff.h 2004-10-16 10:06:30 +0200
-@@ -32,6 +32,8 @@
- #include config.h
+--- src/conff.h.orig 2005-02-20 23:18:53 +0100
src/conff.h 2005-04-08 17:35:45 +0200
+@@ -33,6 +33,8 @@
#include stdio.h
#include pthread.h
+ #include sys/socket.h
+#include sys/types.h
+#include sys/socket.h
#include net/if.h
#include ipvers.h
#include list.h
Index: src/dns.h
src/dns.h.orig 2004-10-01 16:36:02 +0200
-+++ src/dns.h2004-10-16 10:01:40 +0200
-@@ -27,8 +27,9 @@
+--- src/dns.h.orig 2005-02-20 23:34:13 +0100
src/dns.h2005-04-08 17:36:12 +0200
+@@ -27,9 +27,9 @@
#include config.h
#include arpa/inet.h
--#include net/if.h
- #include sys/types.h
-+#include sys/socket.h
-+#include net/if.h
++#include sys/types.h
+ #include sys/socket.h
+ #include net/if.h
+-#include sys/types.h
#include inttypes.h
#include rr_types.h
#include list.h
+Index: src/thread.h
+--- src/thread.h.orig2005-03-15 17:31:28 +0100
src/thread.h 2005-04-08 17:34:38 +0200
+@@ -94,10 +94,16 @@
+ */
+ inline static int usleep_r(unsigned long useconds)
+ {
++#if TARGET==TARGET_SOLARIS
++ struct timeval tv = { tv_sec: (useconds / 100),
++ tv_usec: (useconds % 100) };
++ return select(0, NULL, NULL, NULL, tv);
++#else
+ struct timespec ts = { tv_sec: (useconds / 100),
+ tv_nsec: (useconds % 100) * 1000ul };
+
+ return nanosleep(ts, NULL);
++#endif
+ }
+
+ /* This is a thread-safe sleep().
+@@ -106,9 +112,14 @@
+ */
+ inline static int sleep_r (unsigned int seconds)
+ {
++#if TARGET==TARGET_SOLARIS
++ struct timeval tv = { tv_sec: seconds , tv_usec: 0 };
++ return select(0, NULL, NULL, NULL, tv);
++#else
+ struct timespec ts = { tv_sec: seconds, tv_nsec: 0 };
+
+ return nanosleep(ts, NULL);
++#endif
+ }
+
+
@@ .
patch -p0 '@@ .'
Index: openpkg-src/pdnsd/pdnsd.spec
$ cvs diff -u -r1.13 -r1.14 pdnsd.spec
--- openpkg-src/pdnsd/pdnsd.spec 24 Mar 2005 11:19:53 - 1.13
+++ openpkg-src/pdnsd/pdnsd.spec 8 Apr 2005 15:37:55 - 1.14
@@ -32,11 +32,11 @@
Class:EVAL
Group:DNS
License: GPL
-Version: 1.2
-Release: 20041016
+Version: 1.2.2
+Release: 20050408
# list of sources
-Source0
[CVS] OpenPKG: openpkg-src/libffi/ libffi.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: 08-Apr-2005 17:46:34
Branch: HEAD Handle: 2005040816463400
Modified files:
openpkg-src/libffi libffi.spec
Log:
upgrading package: libffi 20040920 - 20050408
Summary:
RevisionChanges Path
1.16+3 -3 openpkg-src/libffi/libffi.spec
patch -p0 '@@ .'
Index: openpkg-src/libffi/libffi.spec
$ cvs diff -u -r1.15 -r1.16 libffi.spec
--- openpkg-src/libffi/libffi.spec24 Mar 2005 11:19:15 - 1.15
+++ openpkg-src/libffi/libffi.spec8 Apr 2005 15:46:34 - 1.16
@@ -32,8 +32,8 @@
Class:EVAL
Group:Language
License: LGPL
-Version: 20040920
-Release: 20040920
+Version: 20050408
+Release: 20050408
# list of sources
Source0:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/libffi/libffi-%{version}.tar.gz
@@ -92,7 +92,7 @@
--with-multisrctop=src/ \
--prefix=%{l_prefix} \
--disable-shared
-%{l_make} %{l_mflags -O}
+%{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/kaffe/ kaffe.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: 08-Apr-2005 17:54:35
Branch: HEAD Handle: 2005040816543500
Modified files:
openpkg-src/kaffe kaffe.spec
Log:
upgrading package: kaffe 1.1.4 - 1.1.5
Summary:
RevisionChanges Path
1.9 +11 -5 openpkg-src/kaffe/kaffe.spec
patch -p0 '@@ .'
Index: openpkg-src/kaffe/kaffe.spec
$ cvs diff -u -r1.8 -r1.9 kaffe.spec
--- openpkg-src/kaffe/kaffe.spec 24 Mar 2005 11:19:10 - 1.8
+++ openpkg-src/kaffe/kaffe.spec 8 Apr 2005 15:54:35 - 1.9
@@ -32,8 +32,8 @@
Class:EVAL
Group:Language
License: GPL
-Version: 1.1.4
-Release: 20040219
+Version: 1.1.5
+Release: 20050408
# list of sources
Source0:
ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/kaffe-%{version}.tar.gz
@@ -41,8 +41,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, libiconv, gcc, make
-PreReq: OpenPKG, openpkg = 20040130, libiconv
+BuildPreReq: OpenPKG, openpkg = 20040130, gcc, make, jikes
+PreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: libiconv, gmp, libffi
+PreReq: libiconv, gmp, libffi
AutoReq: no
AutoReqProv: no
@@ -72,7 +74,10 @@
./configure \
--prefix=%{l_prefix} \
--with-iconv-prefix=%{l_prefix} \
---with-awt=no \
+--with-jikes=%{l_prefix}/bin/jikes \
+--with-libffi \
+--with-gmp \
+--disable-native-awt \
--with-staticlib \
--enable-pure-java-math \
--disable-shared
@@ -82,6 +87,7 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS=DESTDIR=$RPM_BUILD_ROOT
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* /dev/null 21 || true
+rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wx/ wx.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: 08-Apr-2005 18:37:22
Branch: HEAD Handle: 2005040817372200
Modified files:
openpkg-src/wx wx.spec
Log:
enable Unicode to support pgadmin 1.2.1
Summary:
RevisionChanges Path
1.17+8 -3 openpkg-src/wx/wx.spec
patch -p0 '@@ .'
Index: openpkg-src/wx/wx.spec
$ cvs diff -u -r1.16 -r1.17 wx.spec
--- openpkg-src/wx/wx.spec4 Apr 2005 19:10:13 - 1.16
+++ openpkg-src/wx/wx.spec8 Apr 2005 16:37:22 - 1.17
@@ -33,7 +33,7 @@
Group:XWindow
License: LGPL
Version: 2.5.5
-Release: 20050404
+Release: 20050408
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-%{version}.tar.bz2
@@ -42,8 +42,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, X11, glib, glib::with_threads =
yes, gtk, zlib, png, tiff, jpeg, libiconv, gcc, make
-PreReq: OpenPKG, openpkg = 20040130, X11, glib, glib::with_threads =
yes, gtk, zlib, png, tiff, jpeg, libiconv
+BuildPreReq: OpenPKG, openpkg = 20040130, gcc, make
+PreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: X11, glib, glib::with_threads = yes, gtk
+PreReq: X11, glib, glib::with_threads = yes, gtk
+BuildPreReq: zlib, png, tiff, jpeg, libiconv
+PreReq: zlib, png, tiff, jpeg, libiconv
AutoReq: no
AutoReqProv: no
@@ -86,6 +90,7 @@
--with-libjpeg \
--with-libtiff \
--with-zlib \
+--enable-unicode \
--enable-xrc \
--disable-shared
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/mysql40/ mysql40.patch mysql40.spec
msqlFieldSeek mysql_field_seek -- $*
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
Index: scripts/mysql_config.sh
scripts/mysql_config.sh.orig 2004-10-28 02:48:36 +0200
-+++ scripts/mysql_config.sh 2004-12-14 14:29:04 +0100
-@@ -86,7 +86,7 @@
+--- scripts/mysql_config.sh.orig 2005-03-05 01:38:14 +0100
scripts/mysql_config.sh 2005-03-11 20:28:55 +0100
+@@ -86,9 +86,9 @@
# Create options
@@ -151,3 +111,51 @@
-libs_r=$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@
+libs_r=$ldflags -L$pkglibdir -lmysqlclient_r -lmysys @LIBS@ @openssl_libs@
libs_r=`echo $libs_r | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e
's; *\$;;'`
+ cflags=-I$pkgincludedir @CFLAGS@ #note: end space!
+ include=-I$pkgincludedir
+Index: scripts/mysql_install_db.sh
+--- scripts/mysql_install_db.sh.orig 2005-03-05 01:38:15 +0100
scripts/mysql_install_db.sh 2005-03-11 22:18:52 +0100
+@@ -168,9 +168,8 @@
+ # Create database directories mysql test
+ if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
+ if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700
$ldata/mysql ; fi
+- if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test
; fi
+ if test -w / -a ! -z $user; then
+-chown $user $ldata $ldata/mysql $ldata/test;
++chown $user $ldata $ldata/mysql
+ fi
+
+ # Initialize variables
+@@ -207,8 +206,6 @@
+ c_d=$c_d )
+ c_d=$c_d comment='Database privileges';
+
+- i_d=INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
+- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
+ fi
+
+ if test ! -f $mdata/host.frm
+@@ -281,9 +278,7 @@
+ INSERT INTO user (host,user) values ('localhost','');
+ else
+ i_u=INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+- REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+- INSERT INTO user (host,user) values ('localhost','');
+- REPLACE INTO user (host,user) values ('$hostname','');
++ REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+ fi
+ fi
+
+@@ -387,10 +382,7 @@
+ if test $in_rpm = 0
+ then
+ echo You can start the MySQL daemon with:
+-echo cd @prefix@ ; $bindir/mysqld_safe
+-echo
+-echo You can test the MySQL daemon with the benchmarks in the
'sql-bench' directory:
+-echo cd sql-bench ; perl run-all-tests
++echo @l_prefix@/etc/rc mysql start
+ echo
+ fi
+ echo Please report any problems with the @scriptdir@/mysqlbug script!
@@ .
patch -p0 '@@ .'
Index: openpkg-src/mysql40/mysql40.spec
$ cvs diff -u -r1.9 -r1.10 mysql40.spec
--- openpkg-src/mysql40/mysql40.spec 24 Mar 2005 11:19:36 - 1.9
+++ openpkg-src/mysql40/mysql40.spec 8 Apr 2005 16:56:05 - 1.10
@@ -24,7 +24,7 @@
# package version
%define V_major 4.0
-%define V_minor 23a
+%define V_minor 24
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg%{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group:Database
License: GPL
Version: %{V_opkg}
-Release: 20050324
+Release: 20050408
# package options
%option with_serveryes
@@ -83,7 +83,6 @@
%track
prog mysql40 = {
-comment = rse: 4.0.24 fails to build .texi files
version = %{V_mysql}
url = http://dev.mysql.com/downloads/mysql/%{V_major}.html
regex = mysql-(4\.0\.\d+)\.tar\.gz
@@ -112,6 +111,7 @@
CXXFLAGS=%{l_cxxflags -O} \
CPPFLAGS=%{l_cppflags ncurses} \
LDFLAGS=-L`pwd`/bdb/build_unix -L`pwd`/libmysql %{l_ldflags} \
+MAKEINFO=true \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/mysql
[CVS] OpenPKG: openpkg-src/j2se15/ j2se15.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: 08-Apr-2005 18:58:22
Branch: HEAD Handle: 2005040817582200
Modified files:
openpkg-src/j2se15 j2se15.spec
Log:
upgrading package: j2se15 1.5.0.01 - 1.5.0.02
Summary:
RevisionChanges Path
1.5 +4 -4 openpkg-src/j2se15/j2se15.spec
patch -p0 '@@ .'
Index: openpkg-src/j2se15/j2se15.spec
$ cvs diff -u -r1.4 -r1.5 j2se15.spec
--- openpkg-src/j2se15/j2se15.spec24 Mar 2005 11:19:08 - 1.4
+++ openpkg-src/j2se15/j2se15.spec8 Apr 2005 16:58:22 - 1.5
@@ -23,9 +23,9 @@
##
# package versions
-%define V_sunjava 1_5_0_01
-%define V_filesys 1.5.0_01
-%define V_openpkg 1.5.0.01
+%define V_sunjava 1_5_0_02
+%define V_filesys 1.5.0_02
+%define V_openpkg 1.5.0.02
%define V_sunsupp 1_5_0
# package information
@@ -39,7 +39,7 @@
Group:Language
License: Commercial
Version: %{V_openpkg}
-Release: 20041223
+Release: 20050408
# package options
%option with_demo no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/j2se15/ j2se15.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: 08-Apr-2005 19:54:15
Branch: HEAD Handle: 2005040818541500
Modified files:
openpkg-src/j2se15 j2se15.spec
Log:
cleanup packaging
Summary:
RevisionChanges Path
1.6 +21 -24 openpkg-src/j2se15/j2se15.spec
patch -p0 '@@ .'
Index: openpkg-src/j2se15/j2se15.spec
$ cvs diff -u -r1.5 -r1.6 j2se15.spec
--- openpkg-src/j2se15/j2se15.spec8 Apr 2005 16:58:22 - 1.5
+++ openpkg-src/j2se15/j2se15.spec8 Apr 2005 17:54:15 - 1.6
@@ -23,14 +23,14 @@
##
# package versions
+%define V_openpkg 1.5.0.02
%define V_sunjava 1_5_0_02
%define V_filesys 1.5.0_02
-%define V_openpkg 1.5.0.02
%define V_sunsupp 1_5_0
# package information
Name: j2se15
-Summary: Java 2 Platform, Standard Edition (J2SE) 1.5 (aka 5.0)
+Summary: Java 2 Platform, Standard Edition (J2SE)
URL: http://java.sun.com/j2se/
Vendor: Sun Microsystems, Inc.
Packager: OpenPKG
@@ -72,19 +72,19 @@
Conflicts:j2se
%description
-The premier solution for rapidly developing and deploying
-mission-critical, enterprise applications, J2SE provides the
-essential compiler, tools, runtimes, and APIs for writing,
-deploying, and running applets and applications in the Java
+This is the Sun Java 2 Platform, Standard Edition (J2SE) 5.0, aka
+J2SE 1.5.0. It contains the Java Development Kit (JDK) and the
+Java Runtime Environment (JRE). The premier solution for rapidly
+developing and deploying mission-critical, enterprise applications,
+J2SE provides the essential compiler, tools, runtimes, and APIs for
+writing, deploying, and running applets and applications in the Java
programming language.
%track
prog j2se15 = {
-disabled
-comment = rse: no tracking possible
-version = %{V_sunjava}
-url = http://java.sun.com/j2se/
-regex = j2se-(__VER__)\.tar\.gz
+version = %{V_filesys}
+url = http://java.sun.com/j2se/1.5.0/download.jsp
+regex = jre-(__VER__)-
}
%prep
@@ -97,7 +97,7 @@
# select vendor source
pkgfile=
-suppfile=
+pkgfile2=
docsfile=%{SOURCE jdk-%{V_sunsupp}-doc.zip}
cryptfile=%{SOURCE jce_policy-%{V_sunsupp}.zip}
pkgdir=%{V_filesys}
@@ -108,7 +108,7 @@
;;
sun4u-sunos5.[6-9]* )
pkgfile=%{SOURCE jdk-%{V_sunjava}-solaris-sparc.sh}
-suppfile=%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}
+pkgfile2=%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}
pkgdir=jdk%{V_filesys}
;;
i?86-sunos5.[6-9]* )
@@ -127,8 +127,7 @@
$RPM_BUILD_ROOT%{l_prefix}/cgi \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/libexec \
-$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se15
+$RPM_BUILD_ROOT%{l_prefix}/man/man1
# unpack vendor distribution
( umask 022
@@ -136,21 +135,19 @@
HOME=$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15
case %{l_platform -t} in
i?86-linux2.[2-6]* | i?86-freebsd[45]* )
-echo yes | sh $pkgfile \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se15/COPYING.32
+echo yes | sh $pkgfile COPYING.32
;;
sun4u-sunos5.[6-9]* )
-echo yes | sh $pkgfile \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se15/COPYING.32
-echo yes | sh $suppfile \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se15/COPYING.64
+echo yes | sh $pkgfile COPYING.32
+echo yes | sh $pkgfile2 COPYING.64
;;
i?86-sunos5.[6-9]* )
-echo yes | sh $pkgfile \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se15/COPYING.32
+echo yes | sh $pkgfile COPYING.32
;;
esac
-mv $pkgdir j2se15
+mv $pkgdir/* j2se15/
+mv COPYING.* j2se15/
+rmdir $pkgdir
) || exit $?
# fix vendor distribution
@@ .
__
The
[CVS] OpenPKG: openpkg-src/j2se15/ j2se15.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: 08-Apr-2005 19:58:18
Branch: HEAD Handle: 2005040818581800
Modified files:
openpkg-src/j2se15 j2se15.spec
Log:
fix building under Solaris 10
Summary:
RevisionChanges Path
1.7 +9 -5 openpkg-src/j2se15/j2se15.spec
patch -p0 '@@ .'
Index: openpkg-src/j2se15/j2se15.spec
$ cvs diff -u -r1.6 -r1.7 j2se15.spec
--- openpkg-src/j2se15/j2se15.spec8 Apr 2005 17:54:15 - 1.6
+++ openpkg-src/j2se15/j2se15.spec8 Apr 2005 17:58:18 - 1.7
@@ -106,12 +106,12 @@
pkgfile=%{SOURCE jdk-%{V_sunjava}-linux-i586.bin}
pkgdir=jdk%{V_filesys}
;;
-sun4u-sunos5.[6-9]* )
+sun4u-sunos5.[6-9]* | | sun4u-sunos5.10 )
pkgfile=%{SOURCE jdk-%{V_sunjava}-solaris-sparc.sh}
pkgfile2=%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}
pkgdir=jdk%{V_filesys}
;;
-i?86-sunos5.[6-9]* )
+i?86-sunos5.[6-9]* | i?86-sunos5.10 )
pkgfile=%{SOURCE jdk-%{V_sunjava}-solaris-i586.sh}
pkgdir=jdk%{V_filesys}
;;
@@ -137,14 +137,18 @@
i?86-linux2.[2-6]* | i?86-freebsd[45]* )
echo yes | sh $pkgfile COPYING.32
;;
-sun4u-sunos5.[6-9]* )
+sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
echo yes | sh $pkgfile COPYING.32
echo yes | sh $pkgfile2 COPYING.64
;;
-i?86-sunos5.[6-9]* )
+i?86-sunos5.[6-9]* | i?86-sunos5.10 )
echo yes | sh $pkgfile COPYING.32
;;
esac
+if [ $? != 0 ]; then
+echo ERROR: unpacking failed 12
+exit 1
+fi
mv $pkgdir/* j2se15/
mv COPYING.* j2se15/
rmdir $pkgdir
@@ -156,7 +160,7 @@
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/jre/bin
find . -type f -print | xargs chmod u+w
case %{l_platform -t} in
-sun4u-sunos5.[6-9]* )
+sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/bin/sparcv9
find . -type f -print | xargs chmod u+w
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/jre/bin/sparcv9
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/j2se15/ j2se15.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: 08-Apr-2005 20:17:44
Branch: HEAD Handle: 2005040819174400
Modified files:
openpkg-src/j2se15 j2se15.spec
Log:
more fixes and cleanups
Summary:
RevisionChanges Path
1.8 +4 -4 openpkg-src/j2se15/j2se15.spec
patch -p0 '@@ .'
Index: openpkg-src/j2se15/j2se15.spec
$ cvs diff -u -r1.7 -r1.8 j2se15.spec
--- openpkg-src/j2se15/j2se15.spec8 Apr 2005 17:58:18 - 1.7
+++ openpkg-src/j2se15/j2se15.spec8 Apr 2005 18:17:44 - 1.8
@@ -100,13 +100,13 @@
pkgfile2=
docsfile=%{SOURCE jdk-%{V_sunsupp}-doc.zip}
cryptfile=%{SOURCE jce_policy-%{V_sunsupp}.zip}
-pkgdir=%{V_filesys}
+pkgdir=%{V_filesys}
case %{l_platform -t} in
i?86-linux2.[2-6]* | i?86-freebsd[45]* )
pkgfile=%{SOURCE jdk-%{V_sunjava}-linux-i586.bin}
pkgdir=jdk%{V_filesys}
;;
-sun4u-sunos5.[6-9]* | | sun4u-sunos5.10 )
+sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
pkgfile=%{SOURCE jdk-%{V_sunjava}-solaris-sparc.sh}
pkgfile2=%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}
pkgdir=jdk%{V_filesys}
@@ -203,14 +203,14 @@
# unpack docs if wanted
%if %{with_docs} == yes
-unzip $docsfile
+unzip -q $docsfile
mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/
%endif
# install Java Cryptography Extension (JCE) Unlimited Strength
Jurisdiction Policy
# under confirmation of the US Export Administration Regulations (EAR)
%if %{with_jce} == yes
-unzip $cryptfile
+unzip -q $cryptfile
cp jce/COPYRIGHT.html
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/JCE_COPYRIGHT.html
cp jce/README.txt
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/JCE_README.txt
cp -f jce/US_export_policy.jar
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15/jre/lib/security/
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/j2se15/ j2se15.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: 08-Apr-2005 20:37:49
Branch: HEAD Handle: 2005040819374900
Modified files:
openpkg-src/j2se15 j2se15.spec
Log:
synchronize with j2se14 package
Summary:
RevisionChanges Path
1.9 +3 -1 openpkg-src/j2se15/j2se15.spec
patch -p0 '@@ .'
Index: openpkg-src/j2se15/j2se15.spec
$ cvs diff -u -r1.8 -r1.9 j2se15.spec
--- openpkg-src/j2se15/j2se15.spec8 Apr 2005 18:17:44 - 1.8
+++ openpkg-src/j2se15/j2se15.spec8 Apr 2005 18:37:49 - 1.9
@@ -115,6 +115,8 @@
pkgfile=%{SOURCE jdk-%{V_sunjava}-solaris-i586.sh}
pkgdir=jdk%{V_filesys}
;;
+*) false
+;;
esac
if [ .$pkgfile = . ]; then
echo Sorry, unsupported architecture '%{l_platform -t}' 12
@@ -138,7 +140,7 @@
echo yes | sh $pkgfile COPYING.32
;;
sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
-echo yes | sh $pkgfile COPYING.32
+echo yes | sh $pkgfile COPYING.32 \
echo yes | sh $pkgfile2 COPYING.64
;;
i?86-sunos5.[6-9]* | i?86-sunos5.10 )
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/j2se15/ j2se15.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: 08-Apr-2005 20:42:17
Branch: HEAD Handle: 2005040819421700
Modified files:
openpkg-src/j2se15 j2se15.spec
Log:
fix packaging even more
Summary:
RevisionChanges Path
1.10+2 -2 openpkg-src/j2se15/j2se15.spec
patch -p0 '@@ .'
Index: openpkg-src/j2se15/j2se15.spec
$ cvs diff -u -r1.9 -r1.10 j2se15.spec
--- openpkg-src/j2se15/j2se15.spec8 Apr 2005 18:37:49 - 1.9
+++ openpkg-src/j2se15/j2se15.spec8 Apr 2005 18:42:17 - 1.10
@@ -115,8 +115,6 @@
pkgfile=%{SOURCE jdk-%{V_sunjava}-solaris-i586.sh}
pkgdir=jdk%{V_filesys}
;;
-*) false
-;;
esac
if [ .$pkgfile = . ]; then
echo Sorry, unsupported architecture '%{l_platform -t}' 12
@@ -146,6 +144,8 @@
i?86-sunos5.[6-9]* | i?86-sunos5.10 )
echo yes | sh $pkgfile COPYING.32
;;
+* ) false
+;;
esac
if [ $? != 0 ]; then
echo ERROR: unpacking failed 12
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/j2se14/ j2se14.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: 08-Apr-2005 20:42:57
Branch: HEAD Handle: 2005040819425700
Modified files:
openpkg-src/j2se14 j2se14.spec
Log:
synchronize with j2se15 package
Summary:
RevisionChanges Path
1.43+19 -20 openpkg-src/j2se14/j2se14.spec
patch -p0 '@@ .'
Index: openpkg-src/j2se14/j2se14.spec
$ cvs diff -u -r1.42 -r1.43 j2se14.spec
--- openpkg-src/j2se14/j2se14.spec6 Apr 2005 18:16:39 - 1.42
+++ openpkg-src/j2se14/j2se14.spec8 Apr 2005 18:42:57 - 1.43
@@ -39,7 +39,7 @@
Group:Language
License: Commercial
Version: %{V_openpkg}
-Release: 20050406
+Release: 20050408
# package options
%option with_demo no
@@ -72,10 +72,12 @@
Conflicts:j2se
%description
-The premier solution for rapidly developing and deploying
-mission-critical, enterprise applications, J2SE provides the
-essential compiler, tools, runtimes, and APIs for writing,
-deploying, and running applets and applications in the Java
+This is the Sun Java 2 Platform, Standard Edition (J2SE) 1.4.2.
+It contains the Java Development Kit (JDK) and the Java Runtime
+Environment (JRE). The premier solution for rapidly developing
+and deploying mission-critical, enterprise applications, J2SE
+provides the essential compiler, tools, runtimes, and APIs for
+writing, deploying, and running applets and applications in the Java
programming language.
%track
@@ -97,10 +99,10 @@
# select vendor source
pkgfile=
-suppfile=
+pkgfile2=
docsfile=%{SOURCE j2sdk-%{V_sunsupp}-doc.zip}
cryptfile=%{SOURCE jce_policy-%{V_sunsupp}.zip}
-pkgdir=%{V_filesys}
+pkgdir=%{V_filesys}
case %{l_platform -t} in
i?86-linux2.[2-6]* | i?86-freebsd[45]* )
pkgfile=%{SOURCE j2sdk-%{V_sunjava}-linux-i586.bin}
@@ -127,28 +129,24 @@
$RPM_BUILD_ROOT%{l_prefix}/cgi \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/libexec \
-$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se14
+$RPM_BUILD_ROOT%{l_prefix}/man/man1
# unpack vendor distribution
( umask 022
cd $RPM_BUILD_ROOT%{l_prefix}/libexec
+HOME=$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14
case %{l_platform -t} in
i?86-linux2.[2-6]* | i?86-freebsd[45]* )
-echo yes | sh $pkgfile \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
+echo yes | sh $pkgfile COPYING.32
;;
sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
-echo yes | sh $pkgfile \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32 \
-echo yes | sh $suppfile \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.64
+echo yes | sh $pkgfile COPYING.32 \
+echo yes | sh $pkgfile2 COPYING.64
;;
i?86-sunos5.[6-9]* | i?86-sunos5.10 )
-echo yes | sh $pkgfile \
-$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
+echo yes | sh $pkgfile COPYING.32
;;
-*) false
+* ) false
;;
esac
if [ $? != 0 ]; then
@@ -156,6 +154,7 @@
exit 1
fi
mv $pkgdir j2se14
+mv COPYING.* j2se14/
) || exit $?
# fix vendor distribution
@@ -207,14 +206,14 @@
# unpack docs if wanted
%if %{with_docs} == yes
-unzip $docsfile
+unzip -q $docsfile
mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/
%endif
# install Java Cryptography Extension (JCE) Unlimited Strength
Jurisdiction Policy
# under confirmation of the US Export Administration Regulations (EAR)
%if %{with_jce} == yes
-unzip $cryptfile
+unzip -q $cryptfile
cp jce/COPYRIGHT.html
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/JCE_COPYRIGHT.html
cp jce/README.txt
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/JCE_README.txt
cp -f jce/US_export_policy.jar
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/jre/lib/security
[CVS] OpenPKG: openpkg-src/j2se/ j2se.patch j2se.spec rc.j2se
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: 08-Apr-2005 20:51:17
Branch: HEAD Handle: 2005040819511700
Modified files:
openpkg-src/j2sej2se.spec rc.j2se
Removed files:
openpkg-src/j2sej2se.patch
Log:
upgrade from J2SE 1.3 to 1.5 (aka 5.0)
Summary:
RevisionChanges Path
1.4 +0 -141openpkg-src/j2se/j2se.patch
1.52+148 -93openpkg-src/j2se/j2se.spec
1.10+8 -0 openpkg-src/j2se/rc.j2se
rm -f openpkg-src/j2se/j2se.patch '@@ .'
Index: openpkg-src/j2se/j2se.patch
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 '@@ .'
Index: openpkg-src/j2se/j2se.spec
$ cvs diff -u -r1.51 -r1.52 j2se.spec
--- openpkg-src/j2se/j2se.spec24 Mar 2005 11:19:08 - 1.51
+++ openpkg-src/j2se/j2se.spec8 Apr 2005 18:51:17 - 1.52
@@ -23,19 +23,14 @@
##
# package versions
-%define V_openpkg1.3.1
-%define V_sol_dist 1_3_1_15
-%define V_sol_fsys 1_3_1_15
-%define V_lnx_dist 1_3_1_15
-%define V_lnx_fsys 1.3.1_15
-%define V_bsd_dist 1.3.1.0
-%define V_bsd_fsys 1.3.1
-%define V_jsse_dist 1_0_3_03
-%define V_jsse_fsys 1.0.3_03
+%define V_openpkg 1.5.0.02
+%define V_sunjava 1_5_0_02
+%define V_filesys 1.5.0_02
+%define V_sunsupp 1_5_0
# package information
Name: j2se
-Summary: Java 2 Platform, Standard Edition (J2SE) 1.3
+Summary: Java 2 Platform, Standard Edition (J2SE)
URL: http://java.sun.com/j2se/
Vendor: Sun Microsystems, Inc.
Packager: OpenPKG
@@ -44,58 +39,52 @@
Group:Language
License: Commercial
Version: %{V_openpkg}
-Release: 20041215
+Release: 20050408
# package options
-%option with_native no
-%option with_jsseno
+%option with_demo no
+%option with_docs no
+%option with_jce no
# list of sources
-Source0:
http://java.sun.com/j2se/::/j2sdk-%{V_sol_dist}-solaris-sparc.sh
-Source1: http://java.sun.com/j2se/::/j2sdk-%{V_lnx_dist}-solaris-i586.sh
-Source2: http://java.sun.com/j2se/::/j2sdk-%{V_lnx_dist}-linux-i586.bin
-Source3:
http://www.freebsdfoundation.org/downloads/java.shtml::/diablo-jdk-%{V_bsd_dist}.tgz
-Source4: http://java.sun.com/products/jsse/::/jsse-%{V_jsse_dist}-gl.zip
-Source5: rc.j2se
-Source6: j2se.patch
+Source0: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-linux-i586.bin
+Source1: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-solaris-sparc.sh
+Source2: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-solaris-sparcv9.sh
+Source3: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-solaris-i586.sh
+Source4: http://java.sun.com/j2se/::/jdk-%{V_sunsupp}-doc.zip
+Source5: http://java.sun.com/j2se/::/jce_policy-%{V_sunsupp}.zip
+Source6: rc.j2se
%NoSource 0
%NoSource 1
%NoSource 2
%NoSource 3
%NoSource 4
+%NoSource 5
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20040130
PreReq: OpenPKG, openpkg = 20040130
-%if %{with_jsse} == yes
-BuildPreReq: infozip
-%endif
AutoReq: no
AutoReqProv: no
Provides: JDK, JRE
Conflicts:j2se14
%description
-This is the Sun Java 2 Platform, Standard Edition (J2SE) 1.3.
-It contains the Java Development Kit (JDK) and the Java Runtime
-Environment (JRE). The premier solution for rapidly developing
-and deploying mission-critical, enterprise applications, J2SE
-provides the essential compiler, tools, runtimes, and APIs for
-writing, deploying, and running applets and applications in the
-Java programming language.
+This is the Sun Java 2 Platform, Standard Edition (J2SE) 5.0, aka
+J2SE 1.5.0. It contains the Java Development Kit (JDK) and the
+Java Runtime Environment (JRE). The premier solution for rapidly
+developing and deploying mission-critical, enterprise applications,
+J2SE provides the essential compiler, tools, runtimes, and APIs for
+writing, deploying, and running applets and applications in the Java
+programming language.
%track
[CVS] OpenPKG: openpkg-src/j2se15/ j2se15.spec rc.j2se15
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: 08-Apr-2005 20:51:58 Branch: HEAD Handle: 2005040819515800 Removed files: openpkg-src/j2se15 j2se15.spec rc.j2se15 Log: remove 'j2se15' package as the 'j2se' package is now upgraded to this version Summary: RevisionChanges Path 1.11+0 -245openpkg-src/j2se15/j2se15.spec 1.2 +0 -24 openpkg-src/j2se15/rc.j2se15 rm -f openpkg-src/j2se15/j2se15.spec '@@ .' Index: openpkg-src/j2se15/j2se15.spec [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/j2se15/rc.j2se15 '@@ .' Index: openpkg-src/j2se15/rc.j2se15 [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/tomcat/ rc.tomcat tomcat.patch tomcat.spec
@ -g @l_rgrp@ -m 644 \
--P ${tomcat_jasper_prolog} \
--E ${tomcat_jasper_epilog}; echo 1 $hintfile \
-${tomcat_jasper_file}
-shtool rotate -f \
--n ${tomcat_servlet_numfiles} -s ${tomcat_servlet_minsize} -d \
--z ${tomcat_servlet_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
--P ${tomcat_servlet_prolog} \
--E ${tomcat_servlet_epilog}; echo 1 $hintfile \
-${tomcat_servlet_file}
-shtool rotate -f \
--n ${tomcat_servexample_numfiles} -s ${tomcat_servexample_minsize}
-d \
--z ${tomcat_servexample_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
--P ${tomcat_servexample_prolog} \
--E ${tomcat_servexample_epilog}; echo 1 $hintfile \
-${tomcat_servexample_file}
shtool rotate -f \
--n ${tomcat_tomcat_numfiles} -s ${tomcat_tomcat_minsize} -d \
--z ${tomcat_tomcat_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
--P ${tomcat_tomcat_prolog} \
--E ${tomcat_tomcat_epilog}; echo 1 $hintfile \
-${tomcat_tomcat_file}
-if [ -s $hintfile ]; then
-rc tomcat restart
-fi
-rcTmp -k
+-n ${tomcat_log_numfiles} -s ${tomcat_log_minsize} -d \
+-z ${tomcat_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+-P ${tomcat_log_prolog} \
+-E ${tomcat_log_epilog}; rc tomcat restart \
+@l_prefix@/var/tomcat/log/catalina.out
%env
rcService tomcat enable yes || exit 0
-TOMCAT_HOME=$tomcat_home
-export TOMCAT_HOME
+CATALINA_HOME=$tomcat_home
+export CATALINA
@@ .
rm -f openpkg-src/tomcat/tomcat.patch '@@ .'
Index: openpkg-src/tomcat/tomcat.patch
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 '@@ .'
Index: openpkg-src/tomcat/tomcat.spec
$ cvs diff -u -r1.41 -r1.42 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec24 Mar 2005 11:20:32 - 1.41
+++ openpkg-src/tomcat/tomcat.spec8 Apr 2005 19:20:16 - 1.42
@@ -25,39 +25,39 @@
# package information
Name: tomcat
Summary: Apache Jakarta Tomcat
-URL: http://jakarta.apache.org/
+URL: http://jakarta.apache.org/tomcat/
Vendor: Apache Software Foundation
Packager: OpenPKG
Distribution: OpenPKG
Class:EVAL
Group:Web
License: Apache Software License 1.1
-Version: 3.3.1a
-Release: 20040911
+Version: 5.5.9
+Release: 20050408
# list of sources
-Source0:
http://www.apache.org/dist/jakarta/tomcat-3/src/jakarta-tomcat-%{version}.tar.gz
+Source0:
http://www.apache.org/dist/jakarta/tomcat-5/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
Source1: rc.tomcat
-Source2: tomcat.patch
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20040130
-PreReq: OpenPKG, openpkg = 20040130, JRE
+PreReq: OpenPKG, openpkg = 20040130, j2se = 1.5
AutoReq: no
AutoReqProv: no
%description
-Apache Jakarta Tomcat %{version} is a complete rewrite of Jserv and
-supplies the functionality of both a Servlet API 2.2 and a JSP 1.1
-compliant container.
+Apache Jakarta Tomcat is the reference implementation of both a
+Servlet API 2.4 and JSP Specification 2.0 compliant container.
%track
prog tomcat = {
version = %{version}
-url = http://www.apache.org/dist/jakarta/tomcat-3/src/
-regex = jakarta-tomcat-(\d+\.\d+\.\w+)-src\.tar\.gz
+url = http://www.apache.org/dist/jakarta/tomcat-5/
+regex = (v\d+\.\d+\.\d+)
+url =
http://www.apache.org/dist/jakarta/tomcat-5/__NEWVER__/bin/
+regex = jakarta-tomcat-(\d+\.\d+\.\d+)\.tar\.gz
}
%prep
@@ -74,64 +74,65 @@
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat \
$RPM_BUILD_ROOT%{l_prefix}/share/tomcat/doc \
$RPM_BUILD_ROOT%{l_prefix}/var/tomcat/log \
+$RPM_BUILD_ROOT%{l_prefix}/var/tomcat/temp \
$RPM_BUILD_ROOT%{l_prefix}/var/tomcat/work
# unpack vendor distribution and relocate to final location
-%{l_tar} -cf - --exclude lib/test \
-bin/*.sh conf lib webapps |\
-( umask 022; \
- cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/; \
+%{l_tar} -cf - \
+bin/*.sh bin/*.jar common conf server shared webapps |\
+( umask 022
+ cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/
%{l_tar} -xf -
) || exit $?
-# patch vendor distribution
-( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat
- cat %{SOURCE tomcat.patch
[CVS] OpenPKG: openpkg-src/tomcat4/ rc.tomcat4 tomcat4.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: 08-Apr-2005 21:43:28 Branch: HEAD Handle: 2005040820432700 Removed files: openpkg-src/tomcat4 rc.tomcat4 tomcat4.spec Log: remove Tomcat 4 Summary: RevisionChanges Path 1.16+0 -66 openpkg-src/tomcat4/rc.tomcat4 1.37+0 -164openpkg-src/tomcat4/tomcat4.spec rm -f openpkg-src/tomcat4/rc.tomcat4 '@@ .' Index: openpkg-src/tomcat4/rc.tomcat4 [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/tomcat4/tomcat4.spec '@@ .' Index: openpkg-src/tomcat4/tomcat4.spec [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/tomcat4-adapter/ tomcat4-adapter.conf tomca...
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: 08-Apr-2005 21:43:45 Branch: HEAD Handle: 2005040820434500 Removed files: openpkg-src/tomcat4-adapter tomcat4-adapter.conf tomcat4-adapter.patch tomcat4-adapter.spec Log: remove Tomcat 4 Summary: RevisionChanges Path 1.3 +0 -40 openpkg-src/tomcat4-adapter/tomcat4-adapter.conf 1.5 +0 -112openpkg-src/tomcat4-adapter/tomcat4-adapter.patch 1.26+0 -175openpkg-src/tomcat4-adapter/tomcat4-adapter.spec rm -f openpkg-src/tomcat4-adapter/tomcat4-adapter.conf '@@ .' Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.conf [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/tomcat4-adapter/tomcat4-adapter.patch '@@ .' Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.patch [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/tomcat4-adapter/tomcat4-adapter.spec '@@ .' Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.spec [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/tomcat-adapter/ tomcat-adapter.conf tomcat-...
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: 08-Apr-2005 21:44:24
Branch: HEAD Handle: 2005040820442300
Modified files:
openpkg-src/tomcat-adapter
tomcat-adapter.conf tomcat-adapter.spec
Log:
upgrading package: tomcat-adapter 3.2.4 - 5.5.9
Summary:
RevisionChanges Path
1.2 +3 -3 openpkg-src/tomcat-adapter/tomcat-adapter.conf
1.28+36 -35 openpkg-src/tomcat-adapter/tomcat-adapter.spec
patch -p0 '@@ .'
Index: openpkg-src/tomcat-adapter/tomcat-adapter.conf
$ cvs diff -u -r1.1 -r1.2 tomcat-adapter.conf
--- openpkg-src/tomcat-adapter/tomcat-adapter.conf27 Dec 2001 10:03:54
- 1.1
+++ openpkg-src/tomcat-adapter/tomcat-adapter.conf8 Apr 2005 19:44:23
- 1.2
@@ -13,7 +13,7 @@
JkLogLevelwarn
# assigning URLs to Tomcat
-JkMount /*.jsp ajp12
-JkMount /servlet/* ajp12
-JkMount /examples/* ajp12
+JkMount /*.jsp ajp13
+JkMount /servlet/* ajp13
+JkMount /examples/* ajp13
@@ .
patch -p0 '@@ .'
Index: openpkg-src/tomcat-adapter/tomcat-adapter.spec
$ cvs diff -u -r1.27 -r1.28 tomcat-adapter.spec
--- openpkg-src/tomcat-adapter/tomcat-adapter.spec24 Mar 2005 11:20:33
- 1.27
+++ openpkg-src/tomcat-adapter/tomcat-adapter.spec8 Apr 2005 19:44:23
- 1.28
@@ -32,33 +32,37 @@
Class:EVAL
Group:Web
License: Apache Software License 1.1
-Version: 3.2.4
-Release: 20040920
+Version: 5.5.9
+Release: 20050408
+
+# package options
+%option with_eapi no
# list of sources
-Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/src/jakarta-tomcat-%{version}-src.tar.gz
+Source0:
http://www.apache.org/dist/jakarta/tomcat-5/v%{version}/src/jakarta-tomcat-%{version}-src.tar.gz
Source1: tomcat-adapter.conf
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, JDK, apache, gcc, perl
-PreReq: OpenPKG, openpkg = 20040130, JDK
+BuildPreReq: OpenPKG, openpkg = 20040130, perl, gcc, make, autoconf,
libtool, automake
+PreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: apache, apr
+PreReq: apache, apr
AutoReq: no
AutoReqProv: no
%description
-Apache Jakarta Tomcat Webserver Adapter %{version} is a glue code
-between the Apache webserver and Tomcat.
+Apache Jakarta Tomcat webserver adapter is a glue code between the
+Apache HTTO server and Apache Tomcat. This package contains the
+mod_jk connector for Apache 1.3 only.
%track
prog tomcat-adapter = {
-disabled
version = %{version}
-comment = rse: upgrade needed (ANY HELP APPRECIATED!)
-url = http://jakarta.apache.org/builds/jakarta-tomcat/release/
-regex = v((\d+\.)*\d+)/
-url =
http://jakarta.apache.org/builds/jakarta-tomcat/release/v__NEWVER__/src/
+url = http://www.apache.org/dist/jakarta/tomcat-5/
+regex = (v\d+\.\d+\.\d+)
+url =
http://www.apache.org/dist/jakarta/tomcat-5/__NEWVER__/src/
regex = jakarta-tomcat-(__VER__)-src\.tar\.gz
}
@@ -66,25 +70,19 @@
%setup -q -n jakarta-tomcat-%{version}-src
%build
-# determine platform dependent things
-opts=; subdir=
-case %{l_platform -t} in
-*-freebsd*) opts=-DFREEBSD; subdir=freebsd ;;
-*-linux*) opts=-DLINUX;subdir=linux ;;
-*-sunos*) opts=-DSOLARIS -lposix4; subdir=solaris ;;
-esac
-
-# create installation tree
-j=`%{l_rc} --query JDK_home`
-cd src/native/apache1.3
-%{l_prefix}/sbin/apxs \
-$opts \
--S CC=%{l_prefix}/bin/gcc \
--S LD_SHLIB=%{l_prefix}/bin/gcc \
--I../jk -I$j/include \
--I../jk -I$j/include/$subdir \
--o mod_jk.so \
--c mod_jk.c ../jk/*.c
+( cd jakarta-tomcat-connectors/jk/native
+ sh buildconf.sh
+ ./configure \
+ --prefix=%{l_prefix} \
+ --with-apr=%{l_prefix} \
+ --with-apxs=%{l_prefix}/sbin/apxs \
+%if %{with_eapi} == yes
+ --enable-EAPI
+%else
