Hello community,
here is the log from the commit of package apache2-mod_jk for openSUSE:Factory
checked in at 2013-01-30 09:25:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_jk (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_jk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_jk", Maintainer is "mvysko...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_jk/apache2-mod_jk.changes
2011-09-23 01:51:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apache2-mod_jk.new/apache2-mod_jk.changes
2013-01-30 09:25:18.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Jan 28 19:37:34 UTC 2013 - dims...@opensuse.org
+
+- Update to version 1.2.37:
+ + Fix compatibility with apache 2.4
+- Introduce apxs variable, based on apache_branch. With apache 2.4,
+ apxs2 moved from %{_sbindir} to %{_bindir}.
+
+-------------------------------------------------------------------
Old:
----
tomcat-connectors-1.2.30-src.tar.bz2
New:
----
tomcat-connectors-1.2.37-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_jk.spec ++++++
--- /var/tmp/diff_new_pack.BXEJul/_old 2013-01-30 09:25:20.000000000 +0100
+++ /var/tmp/diff_new_pack.BXEJul/_new 2013-01-30 09:25:20.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_jk
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,30 +16,36 @@
#
-
Name: apache2-mod_jk
-BuildRequires: apache2-devel java2-devel-packages pcre-devel
+BuildRequires: apache2-devel
+BuildRequires: java2-devel-packages
+BuildRequires: pcre-devel
%define section free
-%define connectors_root tomcat-connectors-1.2.30-src
-%define apache2_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)
-%define apache2_libexecdir %(/usr/sbin/apxs2 -q LIBEXECDIR)
-%define apache_mmn %(MMN=$(/usr/sbin/apxs -q
LIBEXECDIR)/MMN; test -x $MMN && $MMN)
-%define apache2_mmn %(MMN=$(/usr/sbin/apxs2 -q
LIBEXECDIR)_MMN; test -x $MMN && $MMN)
-%define apache_cflags %(/usr/sbin/apxs -q CFLAGS)
-%define apache2_cflags %(/usr/sbin/apxs2 -q CFLAGS)
+%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o
"2\\.[0-9]+")
+%if "%{apache_branch}" == "2.4"
+ %define apxs %{_bindir}/apxs2
+%else
+ %define apxs %{_sbindir}/apxs2
+%endif
+%define connectors_root tomcat-connectors-1.2.37-src
+%define apache2_sysconfdir %(%{apxs} -q SYSCONFDIR)
+%define apache2_libexecdir %(%{apxs} -q LIBEXECDIR)
+%define apache2_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN;
test -x $MMN && $MMN)
+%define apache2_cflags %(%{apxs} -q CFLAGS)
Summary: Connectors between Apache and Tomcat Servlet Container
-Version: 1.2.30
-Release: 5
License: Apache-2.0
Group: Productivity/Networking/Web/Frontends
-Requires: apache2 %{apache_mmn}
+Version: 1.2.37
+Release: 0
+Requires: %{apache2_mmn}
+Requires: apache2
Provides: mod_jk = %{version}-%{release}
Provides: mod_jk-ap20
Provides: mod_jk-ap20:%{_libdir}/apache2/mod_jk.so
Obsoletes: mod_jk-ap20 < %{version}
Obsoletes: tomcat-mod < %{version}
Url: http://jakarta.apache.org
-Source0:
http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.30/tomcat-connectors-1.2.30-src.tar.bz2
+Source0:
http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz
Source1: jk.conf
Source2: README.SUSE
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -57,7 +63,7 @@
# prepare apr
export APACHE2_CFLAGS="%apache2_cflags"
cd $RPM_BUILD_DIR/%{connectors_root}/native
-./configure --with-apxs=/usr/sbin/apxs2
+./configure --with-apxs=%{apxs}
make %{?_smp_mflags}
%install
@@ -73,7 +79,6 @@
%defattr(-,root,root,-)
%doc LICENSE README.SUSE
#mod_jk.conf.sample workers.properties.sample
-%doc native/CHANGES
%doc conf/workers.properties
%doc jk.conf
%{apache2_libexecdir}/*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
