Hello community,
here is the log from the commit of package apache2-mod_jk for openSUSE:Factory
checked in at 2014-11-10 17:28:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_jk (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_jk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_jk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_jk/apache2-mod_jk.changes
2014-09-03 19:32:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apache2-mod_jk.new/apache2-mod_jk.changes
2014-11-10 17:28:41.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Nov 3 07:43:17 UTC 2014 - pgaj...@suse.com
+
+- use apache rpm macros
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_jk.spec ++++++
--- /var/tmp/diff_new_pack.vNG9ZT/_old 2014-11-10 17:28:42.000000000 +0100
+++ /var/tmp/diff_new_pack.vNG9ZT/_new 2014-11-10 17:28:42.000000000 +0100
@@ -16,18 +16,7 @@
#
-%define section free
-%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o
"2\\.[0-9]+")
%define connectors_root tomcat-connectors-%{version}-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)
-%if "%{apache_branch}" == "2.4"
- %define apxs %{_bindir}/apxs2
-%else
- %define apxs %{_sbindir}/apxs2
-%endif
Name: apache2-mod_jk
Version: 1.2.40
Release: 0
@@ -38,10 +27,11 @@
Source0:
http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-%{version}-src.tar.gz
Source1: jk.conf
Source2: README.SUSE
+BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: java2-devel-packages
BuildRequires: pcre-devel
-Requires: %{apache2_mmn}
+Requires: %{apache_mmn}
Requires: apache2
Provides: mod_jk = %{version}
Provides: mod_jk-ap20 = %{version}
@@ -62,18 +52,18 @@
%build
# prepare apr
-export APACHE2_CFLAGS="%{apache2_cflags}"
+export APACHE2_CFLAGS="%{apache_cflags}"
cd $RPM_BUILD_DIR/%{connectors_root}/native
%configure \
--with-pic \
- --with-apxs=%{apxs}
+ --with-apxs=%{apache_apxs}
make %{?_smp_mflags}
%install
# AJP Connector jk
-install -d -m 755 %{buildroot}%{apache2_libexecdir}
+install -d -m 755 %{buildroot}%{apache_libexecdir}
pushd $RPM_BUILD_DIR/%{connectors_root}
-install -m 755 native/apache-2.0/.libs/mod_jk.so
%{buildroot}%{apache2_libexecdir}/
+install -m 755 native/apache-2.0/.libs/mod_jk.so
%{buildroot}%{apache_libexecdir}/
popd
cp %{SOURCE1} .
cp %{SOURCE2} .
@@ -84,6 +74,6 @@
#mod_jk.conf.sample workers.properties.sample
%doc conf/workers.properties
%doc jk.conf
-%{apache2_libexecdir}/*
+%{apache_libexecdir}/*
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
