head	1.26;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.26
	OPENPKG_E1_MP:1.26
	OPENPKG_CW_FP:1.24
	OPENPKG_1_STABLE_MP:1.8;
locks; strict;
comment	@-- @;


1.26
date	2005.04.08.19.43.45;	author rse;	state dead;
branches;
next	1.25;

1.25
date	2005.03.24.11.20.33;	author rse;	state Exp;
branches;
next	1.24;

1.24
date	2005.01.01.10.55.24;	author rse;	state Exp;
branches;
next	1.23;

1.23
date	2004.10.11.18.07.48;	author rse;	state Exp;
branches;
next	1.22;

1.22
date	2004.09.09.11.06.25;	author tho;	state Exp;
branches;
next	1.21;

1.21
date	2004.09.09.10.29.26;	author tho;	state Exp;
branches;
next	1.20;

1.20
date	2004.09.08.14.17.22;	author tho;	state Exp;
branches;
next	1.19;

1.19
date	2004.09.08.10.43.46;	author tho;	state Exp;
branches;
next	1.18;

1.18
date	2004.09.07.11.38.53;	author tho;	state Exp;
branches;
next	1.17;

1.17
date	2004.04.15.11.20.42;	author rse;	state Exp;
branches;
next	1.16;

1.16
date	2004.04.15.11.05.53;	author cs;	state Exp;
branches;
next	1.15;

1.15
date	2004.02.12.19.20.42;	author rse;	state Exp;
branches;
next	1.14;

1.14
date	2004.02.07.17.59.24;	author rse;	state Exp;
branches;
next	1.13;

1.13
date	2004.02.03.20.06.59;	author rse;	state Exp;
branches;
next	1.12;

1.12
date	2004.01.28.10.31.32;	author rse;	state Exp;
branches;
next	1.11;

1.11
date	2004.01.24.21.16.21;	author rse;	state Exp;
branches;
next	1.10;

1.10
date	2004.01.23.13.14.52;	author rse;	state Exp;
branches;
next	1.9;

1.9
date	2003.12.17.09.33.05;	author rse;	state Exp;
branches;
next	1.8;

1.8
date	2003.07.17.15.33.27;	author thl;	state Exp;
branches;
next	1.7;

1.7
date	2003.07.09.09.11.02;	author mlelstv;	state Exp;
branches;
next	1.6;

1.6
date	2003.07.08.14.42.56;	author rse;	state Exp;
branches;
next	1.5;

1.5
date	2003.04.08.15.37.43;	author ms;	state Exp;
branches;
next	1.4;

1.4
date	2003.03.22.18.50.13;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2003.01.20.12.52.24;	author mlelstv;	state Exp;
branches;
next	1.2;

1.2
date	2003.01.17.14.54.31;	author mlelstv;	state Exp;
branches;
next	1.1;

1.1
date	2003.01.14.16.40.07;	author mlelstv;	state Exp;
branches;
next	;


desc
@@


1.26
log
@remove Tomcat 4
@
text
@##
##  tomcat4-adapter.spec -- OpenPKG RPM Package Specification
##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
##  Copyright (c) 2000-2005 Ralf S. Engelschall <http://engelschall.com/>
##
##  Permission to use, copy, modify, and distribute this software for
##  any purpose with or without fee is hereby granted, provided that
##  the above copyright notice and this permission notice appear in all
##  copies.
##
##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
##  SUCH DAMAGE.
##

#   package version
%define       V_tomcat 4.1.31
%define       V_apr    1.0.0

#   package information
Name:         tomcat4-adapter
Summary:      Apache Jakarta Tomcat Webserver Adapter
URL:          http://jakarta.apache.org/
Vendor:       Apache Software Foundation
Packager:     OpenPKG
Distribution: OpenPKG
Class:        EVAL
Group:        Web
License:      Apache Software License 1.1
Version:      %{V_tomcat}
Release:      20041011

#   package options
%option       with_mod_webapp yes
%option       with_mod_jk     no

#   list of sources
Source0:      http://www.apache.org/dist/jakarta/tomcat-4/v%{V_tomcat}/src/jakarta-tomcat-connectors-%{V_tomcat}-src.tar.gz
Source1:      http://www.apache.org/dist/apr/apr-%{V_apr}.tar.gz
Source2:      tomcat4-adapter.conf
Patch0:       tomcat4-adapter.patch

#   build information
Prefix:       %{l_prefix}
BuildRoot:    %{l_buildroot}
BuildPreReq:  OpenPKG, openpkg >= 20040130
PreReq:       OpenPKG, openpkg >= 20040130
BuildPreReq:  apache, perl, gcc, make
BuildPreReq:  autoconf, libtool
%if "%{with_mod_jk}" == "yes"
BuildPreReq:  automake
%endif
AutoReq:      no
AutoReqProv:  no

%description
    Apache Jakarta Tomcat Webserver Adapter %{version} is a glue code
    between the Apache webserver and Tomcat. This package contains
    mod_webapp and optionally also mod_jk.

%track
    prog tomcat4-adapter = {
        version   = %{version}
        url       = http://www.apache.org/dist/jakarta/tomcat-4/
        regex     = (v\d+\.\d+\.\d+)
        url       = http://www.apache.org/dist/jakarta/tomcat-4/__NEWVER__/src/
        regex     = jakarta-tomcat-connectors-(__VER__)-src\.tar\.gz
    }

%prep
    %setup -q -n jakarta-tomcat-connectors-%{version}-src
    %setup -q -T -D -a 1 -n jakarta-tomcat-connectors-%{version}-src
    %patch -p0

%build
    tempdir=`pwd`/tmp
    #   first build apr
    ( cd apr-%{V_apr}
      CC="%{l_cc}" \
      CFLAGS="%{l_cflags -O}" \
      ./configure \
          --prefix=%{l_prefix} \
          --includedir=%{l_prefix}/include/apr \
          --enable-layout=GNU \
          --disable-threads \
          --disable-shared
      %{l_make} %{l_mflags -O}
    ) || exit $?
    #   install apr temporaryly
    ( cd apr-%{V_apr}
      rm -rf $tempdir/*
      %{l_make} %{l_mflags} install DESTDIR=$tempdir
    ) || exit $?
    #   now ready to build the connector
    #   optionally build mod_webapp connector
%if "%{with_mod_webapp}" == "yes"
    ( cd webapp
      %{l_shtool} subst \
          -e "s;-l\\\$(APR_LIB);`$tempdir%{l_prefix}/bin/apr-config  --link-ld --libs`;g" \
          apache-1.3/Makefile.in
      ./support/buildconf.sh
      ./configure \
          --prefix=%{l_prefix} \
          --disable-java \
          --without-ant \
          --with-apr=$tempdir%{l_prefix}
      %{l_shtool} subst \
          -e "s;\\(-I%{prefix}/include/apr\\);-I$tempdir%{l_prefix}/include/apr \\1;g" \
          -e "s;\\(-I%{prefix}/lib\\);-L$tempdir%{l_prefix}/lib \\1;g" \
          Makedefs
      %{l_make} %{l_mflags}
    ) || exit $?
%endif

    #   optionally build mod_jk connector
%if "%{with_mod_jk}" == "yes"
    ( cd jk/native
      libtoolize --force --automake --copy
      aclocal
      automake -a --foreign -i --copy
      autoconf
      ./configure \
          --prefix=%{l_prefix} \
          --with-apr=$tempdir%{l_prefix} \
          --with-apxs=%{l_prefix}/sbin/apxs \
          --enable-EAPI
      %{l_make} %{l_mflags} LIBTOOL=$PWD/libtool
    ) || exit $?
%endif

%install
    rm -rf $RPM_BUILD_ROOT

    #   create installation tree
    %{l_shtool} mkdir -f -p -m 755 \
        $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat4-adapter \
        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter \
        $RPM_BUILD_ROOT%{l_prefix}/var/tomcat4-adapter

    #   install config
    %{l_shtool} install -c -m 644 %{l_value -s -a} \
        %{SOURCE tomcat4-adapter.conf} \
        $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat4-adapter/

    #   optionally install mod_webapp DSO
%if "%{with_mod_webapp}" == "yes"
    %{l_shtool} install -c -m 755 \
        webapp/build/mod_webapp.so \
        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter/
%endif

    #   optionally install mod_jk DSO
%if "%{with_mod_jk}" == "yes"
    %{l_shtool} install -c -m 755 \
        jk/native/apache-1.3/mod_jk.so.0 \
        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter/mod_jk.so
%endif

    #   determine installation files
    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}

%files -f files

%clean
    rm -rf $RPM_BUILD_ROOT

@


1.25
log
@Adjust the copyright declaration in this (RSE's) copy of the OpenPKG
source code now that the fork point for C&W was established (CVS tag
OPENPKG_CW_FP), the shared copyright agreement between RSE and C&W is
no longer active (as C&W no longer officially sponsors OpenPKG) and the
new shared copyright from RSE can be taken over by the newly established
juristic entity OpenPKG Foundation e.V. (instead of the non-juristic
entity OpenPKG Project).
@
text
@@


1.24
log
@Happy New Year 2005
@
text
@d2 3
a4 4
##  tomcat4-adapter.spec -- OpenPKG RPM Specification
##  Copyright (c) 2000-2005 The OpenPKG Project <http://www.openpkg.org/>
##  Copyright (c) 2000-2005 Ralf S. Engelschall <rse@@engelschall.com>
##  Copyright (c) 2000-2005 Cable & Wireless <http://www.cw.com/>
d34 1
a34 1
Packager:     The OpenPKG Project
@


1.23
log
@upgrading package: tomcat4-adapter 4.1.30 -> 4.1.31
@
text
@d3 3
a5 3
##  Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
##  Copyright (c) 2000-2004 Ralf S. Engelschall <rse@@engelschall.com>
##  Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
@


1.22
log
@revoke changes made for apr 1.0.0
@
text
@d26 3
a28 1
%define       V_apr               0.9.4
d40 2
a41 2
Version:      4.1.30
Release:      20040909
d48 3
a50 3
Source0:      http://www.apache.org/dist/jakarta/tomcat-4/v%{version}/src/jakarta-tomcat-connectors-%{version}-src.tar.gz
Source1:      tomcat4-adapter.conf
Source2:      http://www.apache.org/dist/apr/apr-%{V_apr}.tar.gz
d82 1
a82 1
    %setup -q -T -D -a 2 -n jakarta-tomcat-connectors-%{version}-src
@


1.21
log
@fixed link path
@
text
@d163 1
a163 1
        jk/native/apache-1.3/mod_jk.so.0.0.0 \
@


1.20
log
@does not link with apr-1.0.0, so include old version
@
text
@d39 1
a39 1
Release:      20040908
d115 4
@


1.19
log
@added missing function parameter
@
text
@d26 2
d48 1
a60 2
BuildPreReq:  apr
PreReq:       apr
d80 1
d84 19
d107 1
a107 1
          -e 's;\-l\$(APR_LIB);`%{l_prefix}/bin/apr\-1\-config  --link-ld --libs`;g' \
d114 1
a114 1
          --with-apr=%{l_prefix}
d128 1
a128 1
          --with-apr=%{l_prefix} \
@


1.18
log
@fixed link string for dependencies of libapr.a
@
text
@d37 1
a37 1
Release:      20040907
@


1.17
log
@- rename with_webapp to with_mod_webapp for consistency
- use sub-shells to change to subdirs or building both modules would fail
- fix dependency, because mod_jk requires automake
- cleanup some comments
@
text
@d37 1
a37 1
Release:      20040415
d85 3
@


1.16
log
@quick hack for mod_jk connector
@
text
@d40 2
a41 2
%option       with_webapp    yes
%option       with_mod_jk    no
d51 1
a51 1
BuildPreReq:  OpenPKG, openpkg >= 20040130, apache, perl, autoconf, libtool, gcc, make
d53 5
d65 2
a66 1
    between the Apache webserver and Tomcat.
d82 11
a92 12
    #   optionally build webapp connector
%if "%{with_webapp}" == "yes"
    #   create installation tree
    cd webapp

    ./support/buildconf.sh
    ./configure \
        --prefix=%{l_prefix} \
        --disable-java \
        --without-ant \
        --with-apr=%{l_prefix}
    %{l_make} %{l_mflags}
d97 12
a108 12
    cd jk/native
    libtoolize --force --automake --copy
    aclocal
    automake -a --foreign -i --copy
    autoconf

    ./configure \
        --prefix=%{l_prefix} \
        --with-apr=%{l_prefix} \
        --with-apxs=%{l_prefix}/sbin/apxs \
        --enable-EAPI
    %{l_make} %{l_mflags} LIBTOOL=$PWD/libtool
d125 2
a126 3
    #   optionally install webapp DSO
%if "%{with_webapp}" == "yes"
    #   install DSO
d139 1
@


1.15
log
@upgrading package: tomcat4-adapter 4.1.29 -> 4.1.30
@
text
@d37 5
a41 1
Release:      20040212
d76 2
d88 17
d120 2
d126 8
@


1.14
log
@Mass Commit:
reduce redundancy within .spec files by referencing
macros defining vendor source versions whenever possible.
This was half-way automated and half-way manually edited.
As a result the PMOD activity in 95% of all cases
just means editing the version in one single place, only.
@
text
@d36 2
a37 2
Version:      4.1.29
Release:      20040207
@


1.13
log
@Mass-Commit:
- split "Distribution" header into "Distribution" (old) and "Class"
  (new) headers by moving the attached class information.
- embed the vendor version tracking configuration through the
  new "%track" section.
- bump up the OpenPKG bootstrap dependency, because the "Class" header
  and "%track" section are only supported by our latest bootstrap version.
@
text
@d37 1
a37 1
Release:      20040203
d60 1
a60 1
        version   = 4.1.29
@


1.12
log
@speclint police
@
text
@d32 2
a33 1
Distribution: OpenPKG [EVAL]
d37 1
a37 1
Release:      20040128
d47 2
a48 2
BuildPreReq:  OpenPKG, openpkg >= 20030717, apache, perl, autoconf, libtool, gcc, make
PreReq:       OpenPKG, openpkg >= 20030717
d57 9
@


1.11
log
@requires GNU make
@
text
@d2 1
a2 1
##  tomcat-adapter4.spec -- OpenPKG RPM Specification
d36 1
a36 1
Release:      20040124
@


1.10
log
@bump year in copyright messages to cover new year 2004. This is a CVS only commit -- no packages were rolled intentionally
@
text
@d36 1
a36 1
Release:      20031217
d46 1
a46 1
BuildPreReq:  OpenPKG, openpkg >= 20030717, apache, perl, autoconf, libtool, gcc
@


1.9
log
@upgrading package: tomcat4-adapter 4.1.24 -> 4.1.29
@
text
@d3 3
a5 3
##  Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
##  Copyright (c) 2000-2003 Ralf S. Engelschall <rse@@engelschall.com>
##  Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
@


1.8
log
@fix PR#204, use new %{l_value -s ...}
@
text
@d35 2
a36 2
Version:      4.1.24
Release:      20030717
d39 1
a39 1
Source0:      http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v%{version}/src/jakarta-tomcat-connectors-%{version}-src.tar.gz
@


1.7
log
@adapt for new libtool version
@
text
@d36 1
a36 1
Release:      20030709
d46 2
a47 2
BuildPreReq:  OpenPKG, openpkg >= 20020206, apache, perl, autoconf, libtool, gcc
PreReq:       OpenPKG, openpkg >= 20020206
d83 1
a83 2
    %{l_shtool} install -c -m 644 \
        -e 's;@@l_prefix@@;%{l_prefix};g' \
@


1.6
log
@cleanup copyright part by using just the main company name of Cable & Wireless and adding the URL to the global website
@
text
@d36 1
a36 1
Release:      20030408
d46 1
a46 1
BuildPreReq:  OpenPKG, openpkg >= 20020206, apache, apr, autoconf, libtool, gcc
d48 2
d71 1
a71 1
    %{l_make} %{l_mflags -O}
@


1.5
log
@Speclint police, add trailing slash to directory path
@
text
@a2 1
##  Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH
d5 1
@


1.4
log
@upgrading package: tomcat4-adapter 4.1.18 -> 4.1.24
@
text
@d36 1
a36 1
Release:      20030322
d89 1
a89 1
        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter
@


1.3
log
@match tomcat4 default configuration
@
text
@d35 2
a36 2
Version:      4.1.18
Release:      20030120
d57 1
a57 1
    %patch0 -p0
@


1.2
log
@Requires apxs from apache package
@
text
@d36 1
a36 1
Release:      20030117
@


1.1
log
@Created package
@
text
@d36 1
a36 1
Release:      20030114
d46 1
a46 1
BuildPreReq:  OpenPKG, openpkg >= 20020206, apr, autoconf, libtool, gcc
@