commit apache-rpm-macros for openSUSE:Factory

2020-02-20 Thread root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2020-02-20 15:37:27

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new.26092 (New)


Package is "apache-rpm-macros"

Thu Feb 20 15:37:27 2020 rev:13 rq:775108 version:20200211

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2019-12-02 11:31:35.434553202 +0100
+++ 
/work/SRC/openSUSE:Factory/.apache-rpm-macros.new.26092/apache-rpm-macros.changes
   2020-02-20 15:37:30.514752196 +0100
@@ -1,0 +2,9 @@
+Tue Feb 11 09:12:20 UTC 2020 - pgaj...@suse.com
+
+- version update to 20200211
+  * remove %apache_test_* macros, %apache_rex_* is the replacement
+(package apache-rex)
+- deleted sources
+  - macros.apache-module-test (not needed)
+
+---

Old:

  macros.apache-module-test



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.MqVcid/_old  2020-02-20 15:37:31.082753189 +0100
+++ /var/tmp/diff_new_pack.MqVcid/_new  2020-02-20 15:37:31.082753189 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-rpm-macros
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -59,13 +59,12 @@
 %endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
-Version:20160120
+Version:20200211
 Release:0
 Summary:Apache RPM Macros
 License:Apache-2.0
 Group:  Productivity/Networking/Web/Servers
-Url:http://httpd.apache.org/
-Source1:macros.apache-module-test
+URL:http://httpd.apache.org/
 %if 0%{?suse_version}
 BuildRequires:  apache%{ap_major}-devel
 %else
@@ -104,7 +103,6 @@
 %install
 mkdir -p %{buildroot}%{macros_dir}
 install -m 644 %{macros_file} %{buildroot}%{macros_dir}
-install -m 644 %{SOURCE1} %{buildroot}%{macros_dir}
 
 %files
 %defattr(-,root,root)

commit apache-rpm-macros for openSUSE:Factory

2019-12-02 Thread root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2019-12-02 11:29:20

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new.4691 (New)


Package is "apache-rpm-macros"

Mon Dec  2 11:29:20 2019 rev:12 rq:750688 version:20160120

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2016-02-16 09:27:28.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.apache-rpm-macros.new.4691/apache-rpm-macros.changes
2019-12-02 11:31:35.434553202 +0100
@@ -1,0 +2,5 @@
+Sun Nov 24 17:42:16 UTC 2019 - Neal Gompa 
+
+- Replace incorrect usage of %_libexecdir/rpm with %_rpmconfigdir
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.pkj67r/_old  2019-12-02 11:31:36.886552530 +0100
+++ /var/tmp/diff_new_pack.pkj67r/_new  2019-12-02 11:31:36.902552522 +0100
@@ -53,7 +53,7 @@
 %endif
 #
 %if 0%{?suse_version} > 1230
-%define macros_dir%{_libexecdir}/rpm/macros.d
+%define macros_dir%{_rpmconfigdir}/macros.d
 %else
 %define macros_dir%{_sysconfdir}/rpm
 %endif

commit apache-rpm-macros for openSUSE:Factory

2016-02-16 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2016-02-16 09:27:27

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is "apache-rpm-macros"

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2016-01-23 01:03:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2016-02-16 09:27:28.0 +0100
@@ -1,0 +2,7 @@
+Wed Jan 20 18:33:51 UTC 2016 - pgaj...@suse.com
+
+- version 20161120
+- %apache_test_module_start_apache: detect if module is built in
+  statically before attempt to search for it in filesystem
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.D6gfYY/_old  2016-02-16 09:27:29.0 +0100
+++ /var/tmp/diff_new_pack.D6gfYY/_new  2016-02-16 09:27:29.0 +0100
@@ -59,7 +59,7 @@
 %endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
-Version:20160111
+Version:20160120
 Release:0
 Summary:Apache RPM Macros
 License:Apache-2.0

++ macros.apache-module-test ++
--- /var/tmp/diff_new_pack.D6gfYY/_old  2016-02-16 09:27:29.0 +0100
+++ /var/tmp/diff_new_pack.D6gfYY/_new  2016-02-16 09:27:29.0 +0100
@@ -70,7 +70,8 @@
   if [ -z "$TEST_MPM" ]; then \
 TEST_MPM='%{__test_mpm}' \
   fi \
-  # helpers \
+  # apache binary \
+  CMD=$(ls %{_sbindir}/httpd*-$TEST_MPM | head -n 1) \
   # begin \
   echo "---" \
   echo "APACHE MODULE TEST" \
@@ -97,6 +98,8 @@
   fi \
   echo "LoadModule authz_host_module $SYSTEM_MODULE_PATH/mod_authz_host.so"
>> $TEST_CONF_FILE \
   for m in $(echo $MODULES | tr ':' ' '); do \
+# if module is compiled in statically, do not load \
+$CMD -f $TEST_CONF_FILE -M | grep $m && continue \
 module_path=$(find %{buildroot} %{apache_libexecdir}-$TEST_MPM 
%{apache_libexecdir} -name "mod_$m.so" | tail -n 1) \
 if [ -z "$module_path" ]; then \
   echo "ERROR: Module $m not found." \
@@ -124,7 +127,6 @@
   echo "DocumentRoot $DOCUMENT_ROOT"   
>> $TEST_CONF_FILE \
   echo "DirectoryIndex index.html" 
>> $TEST_CONF_FILE \
   # run apache \
-  CMD=$(ls %{_sbindir}/httpd*-$TEST_MPM | head -n 1) \
   echo -n "Starting Apache ... " \
   $CMD -f $TEST_CONF_FILE -k start \
   # wait to be sure apache finished start \

commit apache-rpm-macros for openSUSE:Factory

2016-01-22 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2016-01-23 01:03:19

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is "apache-rpm-macros"

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2015-12-20 10:51:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2016-01-23 01:03:20.0 +0100
@@ -1,0 +2,6 @@
+Mon Jan 11 15:21:58 UTC 2016 - pgaj...@suse.com
+
+- version 20160111
+  * added %{apache_version}
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.eJoweb/_old  2016-01-23 01:03:21.0 +0100
+++ /var/tmp/diff_new_pack.eJoweb/_new  2016-01-23 01:03:21.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-rpm-macros
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,8 +23,10 @@
 %define ap_major 2
 %if 0%{?suse_version}
 %define ap_branch%(rpm -q --qf "%%{version}" apache%{ap_major} 
| tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; })
+%define ap_version   %(rpm -q --qf "%%{version}" apache%{ap_major} 
| tr '.' ' ' | { read maj min patch; printf "%d%02d%02d" $maj $min $patch; })
 %else
 %define ap_branch%(rpm -q --qf "%%{version}" httpd |   
  tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; })
+%define ap_version   %(rpm -q --qf "%%{version}" httpd |   
  tr '.' ' ' | { read maj min patch; printf "%d%02d%02d" $maj $min $patch; })
 %endif
 %define ap_pname apache%{ap_major}
 %define ap_apxs  %(ls -1 /usr/{,s}bin/apxs{,2} 2>/dev/null | 
head -n 1)
@@ -57,7 +59,7 @@
 %endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
-Version:20151211
+Version:20160111
 Release:0
 Summary:Apache RPM Macros
 License:Apache-2.0
@@ -81,6 +83,7 @@
 cat << eom > %{macros_file}
 %%apache_major   %{ap_major}
 %%apache_branch  %{ap_branch}
+%%apache_version %{ap_version}
 %%apache_pname   %{ap_pname}
 %%apache_apxs%{ap_apxs}
 %%apache_cflags  %{ap_cflags}

commit apache-rpm-macros for openSUSE:Factory

2015-12-20 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2015-12-20 10:51:05

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is "apache-rpm-macros"

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2015-11-24 22:29:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2015-12-20 10:51:07.0 +0100
@@ -1,0 +2,14 @@
+Thu Nov 26 08:51:19 UTC 2015 - pgaj...@suse.com
+
+- version 20151211
+- %apache_test_module_start_apache:
+  * declare -p switch in function header
+  * fix wording of messages when apache start failed
+  * report unsuccessful start also to stderr to see it in build
+log, when stdout is redirected to a file (see apache-test: 
+when apache test failed, macro is exiting 1, so the log is
+not cat'ed to output)
+  * %{apache_branch} converted to a number: 204 for 2.4, 
+202 for 2.2
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.IMjALv/_old  2015-12-20 10:51:08.0 +0100
+++ /var/tmp/diff_new_pack.IMjALv/_new  2015-12-20 10:51:08.0 +0100
@@ -22,9 +22,9 @@
 
 %define ap_major 2
 %if 0%{?suse_version}
-%define ap_branch%(rpm -q --qf "%%{version}" apache%{ap_major} 
| sed "s:\\(\\..*\\)\\..*:\\1:")
+%define ap_branch%(rpm -q --qf "%%{version}" apache%{ap_major} 
| tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; })
 %else
-%define ap_branch%(rpm -q --qf "%%{version}" httpd | sed 
"s:\\(\\..*\\)\\..*:\\1:")
+%define ap_branch%(rpm -q --qf "%%{version}" httpd |   
  tr '.' ' ' | { read maj min patch; printf "%d%02d" $maj $min; })
 %endif
 %define ap_pname apache%{ap_major}
 %define ap_apxs  %(ls -1 /usr/{,s}bin/apxs{,2} 2>/dev/null | 
head -n 1)
@@ -57,7 +57,7 @@
 %endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
-Version:20150930
+Version:20151211
 Release:0
 Summary:Apache RPM Macros
 License:Apache-2.0

++ macros.apache-module-test ++
--- /var/tmp/diff_new_pack.IMjALv/_old  2015-12-20 10:51:08.0 +0100
+++ /var/tmp/diff_new_pack.IMjALv/_new  2015-12-20 10:51:08.0 +0100
@@ -39,7 +39,7 @@
 #   [default value: prefork]
 #
 #
-%apache_test_module_start_apache(m:,i:,r:,u:,g:,t:) \
+%apache_test_module_start_apache(m:,i:,r:,u:,g:,p:,t:) \
   # constants \
   TEST_DIR='%{__test_dir}' \
   # arguments \
@@ -71,7 +71,6 @@
 TEST_MPM='%{__test_mpm}' \
   fi \
   # helpers \
-  APACHE_BRANCH=$(echo %{apache_branch} | tr -d '.') \
   # begin \
   echo "---" \
   echo "APACHE MODULE TEST" \
@@ -93,7 +92,7 @@
   echo "ErrorLog $TEST_DIR/error_log"  
>> $TEST_CONF_FILE \
   echo "LoadModule dir_module$SYSTEM_MODULE_PATH/mod_dir.so"   
>> $TEST_CONF_FILE \
   echo "LoadModule auth_basic_module $SYSTEM_MODULE_PATH/mod_auth_basic.so"
>> $TEST_CONF_FILE \
-  if [ $APACHE_BRANCH -ge 24 ]; then \
+  if [ %{apache_branch} -ge 204 ]; then \
 echo "LoadModule authz_core_module $SYSTEM_MODULE_PATH/mod_authz_core.so"  
>> $TEST_CONF_FILE \
   fi \
   echo "LoadModule authz_host_module $SYSTEM_MODULE_PATH/mod_authz_host.so"
>> $TEST_CONF_FILE \
@@ -131,9 +130,12 @@
   # wait to be sure apache finished start \
   sleep 2 \
   if [ ! -f $TEST_DIR/pid ]; then \
-echo "FAILED:" \
+echo "FAILED, $TEST_DIR/error_log: >&2" \
+cat $TEST_DIR/error_log >&2 \
+echo "See $TEST_DIR for details" >&2 \
+echo "FAILED, $TEST_DIR/error_log:" \
 cat $TEST_DIR/error_log \
-echo "See $PWD/$TEST_DIR for details" \
+echo "See $TEST_DIR for details" \
 exit 1  \
   fi \
   echo "SUCCESS" \
@@ -142,13 +144,16 @@
 #
 # macro: apache_test_module_stop_apache -- stops apache previously started 
with *_start_apache
 # 
-#usage: apache_test_module_stop_apache
+#usage: apache_test_module_stop_apache [-f]
 #
-%apache_test_module_stop_apache() \
+#   -f: force
+#
+%apache_test_module_stop_apache(f) \
   TEST_DIR='%{__test_dir}' \
+  SIGNAL=%{!-f:TERM}%{-f:KILL} \
   # stop apache \
   echo "Stopping Apache ..." \
-  kill -TERM `cat $TEST_DIR/pid` \
+  kill -$SIGNAL -$(cat $TEST_DIR/pid) \
   echo "Done." \
   echo "---" \
   %nil

commit apache-rpm-macros for openSUSE:Factory

2015-11-24 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2015-11-24 22:29:54

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is "apache-rpm-macros"

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2015-10-14 16:41:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2015-11-24 22:29:55.0 +0100
@@ -1,0 +2,11 @@
+Tue Nov 10 15:34:04 UTC 2015 - pgaj...@suse.com
+
+- require apache-rpm-macros-control [bsc#893659]
+
+---
+Thu Nov  5 11:54:12 UTC 2015 - pgaj...@suse.com
+
+- do not append macros.apache-module-test to macros.apache, provide
+  separate macros file instead
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.VeniMl/_old  2015-11-24 22:29:56.0 +0100
+++ /var/tmp/diff_new_pack.VeniMl/_new  2015-11-24 22:29:56.0 +0100
@@ -69,6 +69,7 @@
 %else
 BuildRequires:  httpd-devel
 %endif
+Requires:   apache-rpm-macros-control
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -96,15 +97,15 @@
 %%apache_access_syntax_version   %{ap_access_syntax_version}
 eom
 echo >> %{macros_file}
-cat %{SOURCE1} >> %{macros_file}
 
 %install
 mkdir -p %{buildroot}%{macros_dir}
 install -m 644 %{macros_file} %{buildroot}%{macros_dir}
+install -m 644 %{SOURCE1} %{buildroot}%{macros_dir}
 
 %files
 %defattr(-,root,root)
 %dir %{macros_dir}
-%{macros_dir}/%{macros_file}
+%{macros_dir}/macros.apache*
 
 %changelog

commit apache-rpm-macros for openSUSE:Factory

2015-10-14 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2015-10-14 16:41:56

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is "apache-rpm-macros"

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2015-09-19 06:54:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2015-10-14 16:41:58.0 +0200
@@ -1,0 +2,16 @@
+Wed Sep 30 17:14:29 UTC 2015 - pgaj...@suse.com
+
+- version 20150930
+- %apache_test_module_start_apache, %apache_test_module_load:
+  introduce -t option
+- %apache_test_module_curl: introduce -r option
+
+---
+Tue Sep 22 07:16:24 UTC 2015 - pgaj...@suse.com
+
+- version 20150921
+- make package usable also for other rpm based distros
+- %apache_test_module_start_apache: introduce -p, -u and -g options
+- %apache_test_module_curl: introduce -p and -u option
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.gKItXC/_old  2015-10-14 16:41:58.0 +0200
+++ /var/tmp/diff_new_pack.gKItXC/_new  2015-10-14 16:41:58.0 +0200
@@ -21,21 +21,34 @@
 %endif
 
 %define ap_major 2
+%if 0%{?suse_version}
 %define ap_branch%(rpm -q --qf "%%{version}" apache%{ap_major} 
| sed "s:\\(\\..*\\)\\..*:\\1:")
+%else
+%define ap_branch%(rpm -q --qf "%%{version}" httpd | sed 
"s:\\(\\..*\\)\\..*:\\1:")
+%endif
 %define ap_pname apache%{ap_major}
-%define ap_apxs  %(rpm -ql apache%{ap_major}-devel | grep 
'apxs[2]\\?$' | head -n 1)
+%define ap_apxs  %(ls -1 /usr/{,s}bin/apxs{,2} 2>/dev/null | 
head -n 1)
 %define ap_cflags%(%{ap_apxs} -q CFLAGS)
 %define ap_includedir%(%{ap_apxs} -q INCLUDEDIR)
 %define ap_libexecdir%(%{ap_apxs} -q LIBEXECDIR)
 %define ap_localstatedir %(%{ap_apxs} -q LOCALSTATEDIR)
+%if 0%{?suse_version}
 %define ap_mmn   %(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test 
-x $MMN && $MMN)
 %define ap_maint_mmn %(MMN=$(rpm -q --provides apache2 | grep 
suse_maintenance_mmn); test -z "$MMN" && MMN=apache2; echo $MMN)
+%endif
 %define ap_serverroot%(%{ap_apxs} -q PREFIX)
 %define ap_sysconfdir%(%{ap_apxs} -q SYSCONFDIR)
 %define ap_datadir   %(%{ap_apxs} -q DATADIR)
+%if 0%{?suse_version}
 %define ap_user  wwwrun
 %define ap_group www
+%else
+%define ap_user  apache
+%define ap_group apache
+%endif
+%if 0%{?suse_version}
 %define ap_access_syntax_version %(if [ $(grep -c '^[[:space:]]*Require all 
denied' /etc/apache2/httpd.conf) -gt 0 ]; then echo 24; else echo 22; fi)
+%endif
 #
 %if 0%{?suse_version} > 1230
 %define macros_dir%{_libexecdir}/rpm/macros.d
@@ -44,14 +57,18 @@
 %endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
-Version:20150918
+Version:20150930
 Release:0
 Summary:Apache RPM Macros
 License:Apache-2.0
 Group:  Productivity/Networking/Web/Servers
 Url:http://httpd.apache.org/
 Source1:macros.apache-module-test
+%if 0%{?suse_version}
 BuildRequires:  apache%{ap_major}-devel
+%else
+BuildRequires:  httpd-devel
+%endif
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description

++ macros.apache-module-test ++
--- /var/tmp/diff_new_pack.gKItXC/_old  2015-10-14 16:41:58.0 +0200
+++ /var/tmp/diff_new_pack.gKItXC/_new  2015-10-14 16:41:58.0 +0200
@@ -10,7 +10,8 @@
 #
 # macro: apache_test_module_start_apache -- start apache with specified 
modules loaded
 # 
-#usage: apache_test_module_start_apache -m module_list [-i 
include_list] [-r document_root]
+#usage: apache_test_module_start_apache [-m module_list] [-i 
include_list] [-r document_root] 
+#   [-u user] [-g group] [-p port] 
[-t mpm]
 #
 #module_list:   colon separated list of module names to be loaded with 
test run
 #   search path:  %{buildroot} tree
@@ -25,16 +26,22 @@
 # %{apache_test_module_dir}
 #   [example value: mod_asn.conf]
 #document_root: document root of the test server, 
-#   [default value: $PWD/test/htdocs]
+#   [default value: /tmp/%%{name}-test/htdocs]
+#user:

commit apache-rpm-macros for openSUSE:Factory

2015-09-18 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2015-09-19 06:54:32

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is "apache-rpm-macros"

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2015-08-07 00:18:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2015-09-19 06:54:33.0 +0200
@@ -1,0 +2,41 @@
+Fri Sep 18 08:18:45 UTC 2015 - pgaj...@suse.com
+
+- version 20150918
+- -m is no longer required (see apache2-mod_apreq2 for usecase)
+
+---
+Tue Sep 15 09:13:18 UTC 2015 - pgaj...@suse.com
+
+- version 20150915
+- new macro: %apache_access_syntax_version
+
+---
+Sat Sep  5 07:22:53 UTC 2015 - pgaj...@suse.com
+
+- version 20150904
+- new macros: %apache_test_module_curl, %apache_test_module_dir
+
+---
+Thu Sep  3 08:36:35 UTC 2015 - pgaj...@suse.com
+
+- version 20150903
+- %apache_test_module_start_apache:
+* better check that httpd is really running
+* add -p to mkdir test to not fail if test exist and do not 
+  remove test dir
+
+---
+Mon Aug 31 08:30:28 UTC 2015 - pgaj...@suse.com
+
+- bump version to 20150902
+
+---
+Fri Aug 28 08:27:11 UTC 2015 - pgaj...@suse.com
+
+- added macros to test loading modules
+  %apache_test_module_start_apache
+  %apache_test_module_stop_apache
+  %apache_test_module_load
+  + macros.apache-module-test
+
+---

New:

  macros.apache-module-test



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.TcMwmG/_old  2015-09-19 06:54:34.0 +0200
+++ /var/tmp/diff_new_pack.TcMwmG/_new  2015-09-19 06:54:34.0 +0200
@@ -35,6 +35,7 @@
 %define ap_datadir%(%{ap_apxs} -q DATADIR)
 %define ap_user   wwwrun
 %define ap_group  www
+%define ap_access_syntax_version %(if [ $(grep -c '^[[:space:]]*Require all 
denied' /etc/apache2/httpd.conf) -gt 0 ]; then echo 24; else echo 22; fi)
 #
 %if 0%{?suse_version} > 1230
 %define macros_dir%{_libexecdir}/rpm/macros.d
@@ -43,12 +44,13 @@
 %endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
-Version:20150717
+Version:20150918
 Release:0
 Summary:Apache RPM Macros
 License:Apache-2.0
 Group:  Productivity/Networking/Web/Servers
 Url:http://httpd.apache.org/
+Source1:macros.apache-module-test
 BuildRequires:  apache%{ap_major}-devel
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -74,7 +76,10 @@
 %%apache_datadir %{ap_datadir}
 %%apache_user%{ap_user}
 %%apache_group   %{ap_group}
+%%apache_access_syntax_version   %{ap_access_syntax_version}
 eom
+echo >> %{macros_file}
+cat %{SOURCE1} >> %{macros_file}
 
 %install
 mkdir -p %{buildroot}%{macros_dir}

++ macros.apache-module-test ++
%__test_dir   /tmp/%{name}-test
%__test_mpm   prefork
%__test_user  abuild
%__test_group abuild
%__test_port  60080

# world writeable dir for testing purposes (logs, document root, ..)
%apache_test_module_dir %{__test_dir}

#
# macro: apache_test_module_start_apache -- start apache with specified modules 
loaded
# 
#usage: apache_test_module_start_apache -m module_list [-i 
include_list] [-r document_root]
#
#module_list:   colon separated list of module names to be loaded with 
test run
#   search path:  %{buildroot} tree
# %{apache_libexecdir}-prefork
# %{apache_libexecdir}
#   [example value: asn:dbd]
#include_list:  colon separated list of names of apache configuration 
files
#   to be included; can be either existing path or just name
#   of the configuration file,which will be searched under:
# %{buildroot}%{apache_sysconfdir} tree
# $PWD tree
# %{apache_test_module_dir}
#   [example value: mod_asn.conf]
#document_root: document root of the test server, 
#   [default value: $PWD/test/htdocs]
#
#

commit apache-rpm-macros for openSUSE:Factory

2015-08-06 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2015-08-07 00:18:15

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is apache-rpm-macros

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2015-07-16 17:17:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2015-08-07 00:18:16.0 +0200
@@ -1,0 +2,16 @@
+Tue Jul 28 12:01:08 UTC 2015 - pgaj...@suse.com
+
+- this is arch package
+
+---
+Mon Jul 27 16:03:19 UTC 2015 - pgaj...@suse.com
+
+- bump version to 20150717
+
+---
+Fri Jul 17 06:36:39 UTC 2015 - pgaj...@suse.com
+
+- %{apache_suse_maintenance_mmn} expands to just 'apache2' when
+  apache2 does not provide suse_maintenance_mmn_# symbol
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.juMabu/_old  2015-08-07 00:18:17.0 +0200
+++ /var/tmp/diff_new_pack.juMabu/_new  2015-08-07 00:18:17.0 +0200
@@ -29,7 +29,7 @@
 %define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR)
 %define ap_localstatedir  %(%{ap_apxs} -q LOCALSTATEDIR)
 %define ap_mmn%(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN 
 $MMN)
-%define ap_maint_mmn  %(rpm -q --provides apache2 | grep 
suse_maintenance_mmn)
+%define ap_maint_mmn  %(MMN=$(rpm -q --provides apache2 | grep 
suse_maintenance_mmn); test -z $MMN  MMN=apache2; echo $MMN)
 %define ap_serverroot %(%{ap_apxs} -q PREFIX)
 %define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR)
 %define ap_datadir%(%{ap_apxs} -q DATADIR)
@@ -43,7 +43,7 @@
 %endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
-Version:2014
+Version:20150717
 Release:0
 Summary:Apache RPM Macros
 License:Apache-2.0
@@ -51,7 +51,6 @@
 Url:http://httpd.apache.org/
 BuildRequires:  apache%{ap_major}-devel
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildArch:  noarch
 
 %description
 RPM Macros intended for Apache modules spec files.

commit apache-rpm-macros for openSUSE:Factory

2015-07-16 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2015-07-16 17:17:10

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is apache-rpm-macros

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2014-11-13 09:17:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2015-07-16 17:17:12.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 13 11:50:52 UTC 2015 - pgaj...@suse.com
+
+- new macro: %{apache_suse_maintenance_mmn} [bnc#915666] (internal)
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.5oR7Xq/_old  2015-07-16 17:17:13.0 +0200
+++ /var/tmp/diff_new_pack.5oR7Xq/_new  2015-07-16 17:17:13.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-rpm-macros
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %if 0%{?suse_version}  1130
 %define _libexecdir   /usr/lib
 %endif
@@ -28,6 +29,7 @@
 %define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR)
 %define ap_localstatedir  %(%{ap_apxs} -q LOCALSTATEDIR)
 %define ap_mmn%(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN 
 $MMN)
+%define ap_maint_mmn  %(rpm -q --provides apache2 | grep 
suse_maintenance_mmn)
 %define ap_serverroot %(%{ap_apxs} -q PREFIX)
 %define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR)
 %define ap_datadir%(%{ap_apxs} -q DATADIR)
@@ -67,6 +69,7 @@
 %%apache_libexecdir%{ap_libexecdir}
 %%apache_localstatedir %{ap_localstatedir}
 %%apache_mmn   %{ap_mmn}
+%%apache_suse_maintenance_mmn%{ap_maint_mmn}
 %%apache_serverroot%{ap_serverroot}
 %%apache_sysconfdir%{ap_sysconfdir}
 %%apache_datadir   %{ap_datadir}

commit apache-rpm-macros for openSUSE:Factory

2014-11-13 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2014-11-13 09:17:28

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is apache-rpm-macros

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2014-11-05 15:55:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2014-11-13 09:17:42.0 +0100
@@ -1,0 +2,5 @@
+Tue Nov 11 09:58:44 UTC 2014 - pgaj...@suse.com
+
+- new macros: %{apache_user}, %{apache_group} [bnc#904409]
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.FvmZrJ/_old  2014-11-13 09:17:44.0 +0100
+++ /var/tmp/diff_new_pack.FvmZrJ/_new  2014-11-13 09:17:44.0 +0100
@@ -31,6 +31,8 @@
 %define ap_serverroot %(%{ap_apxs} -q PREFIX)
 %define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR)
 %define ap_datadir%(%{ap_apxs} -q DATADIR)
+%define ap_user   wwwrun
+%define ap_group  www
 #
 %if 0%{?suse_version}  1230
 %define macros_dir%{_libexecdir}/rpm/macros.d
@@ -39,7 +41,7 @@
 %endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
-Version:20141017
+Version:2014
 Release:0
 Summary:Apache RPM Macros
 License:Apache-2.0
@@ -68,6 +70,8 @@
 %%apache_serverroot%{ap_serverroot}
 %%apache_sysconfdir%{ap_sysconfdir}
 %%apache_datadir   %{ap_datadir}
+%%apache_user  %{ap_user}
+%%apache_group %{ap_group}
 eom
 
 %install

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit apache-rpm-macros for openSUSE:Factory

2014-11-05 Thread h_root 
Hello community,

here is the log from the commit of package apache-rpm-macros for 
openSUSE:Factory checked in at 2014-11-05 15:55:00

Comparing /work/SRC/openSUSE:Factory/apache-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.apache-rpm-macros.new (New)


Package is apache-rpm-macros

Changes:

--- /work/SRC/openSUSE:Factory/apache-rpm-macros/apache-rpm-macros.changes  
2014-11-03 13:13:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.apache-rpm-macros.new/apache-rpm-macros.changes 
2014-11-05 15:55:19.0 +0100
@@ -1,0 +2,10 @@
+Tue Nov  4 14:43:18 UTC 2014 - pgaj...@suse.com
+
+- add %{apache_datadir} macro
+
+---
+Mon Nov  3 07:23:01 UTC 2014 - pgaj...@suse.com
+
+- fix %{apache_apxs} macro
+
+---



Other differences:
--
++ apache-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.yK0Syo/_old  2014-11-05 15:55:21.0 +0100
+++ /var/tmp/diff_new_pack.yK0Syo/_new  2014-11-05 15:55:21.0 +0100
@@ -22,7 +22,7 @@
 %define ap_major  2
 %define ap_branch %(rpm -q --qf %%{version} apache%{ap_major} | sed 
s:\\(\\..*\\)\\..*:\\1:)
 %define ap_pname  apache%{ap_major}
-%define ap_apxs   %{_sbindir}/apxs%{ap_major}
+%define ap_apxs   %(rpm -ql apache%{ap_major}-devel | grep 
'apxs[2]\\?$' | head -n 1)
 %define ap_cflags %(%{ap_apxs} -q CFLAGS)
 %define ap_includedir %(%{ap_apxs} -q INCLUDEDIR)
 %define ap_libexecdir %(%{ap_apxs} -q LIBEXECDIR)
@@ -30,7 +30,13 @@
 %define ap_mmn%(MMN=$(%{ap_apxs} -q LIBEXECDIR)_MMN; test -x $MMN 
 $MMN)
 %define ap_serverroot %(%{ap_apxs} -q PREFIX)
 %define ap_sysconfdir %(%{ap_apxs} -q SYSCONFDIR)
+%define ap_datadir%(%{ap_apxs} -q DATADIR)
+#
+%if 0%{?suse_version}  1230
 %define macros_dir%{_libexecdir}/rpm/macros.d
+%else
+%define macros_dir%{_sysconfdir}/rpm
+%endif
 %define macros_file   macros.apache
 Name:   apache-rpm-macros
 Version:20141017
@@ -61,6 +67,7 @@
 %%apache_mmn   %{ap_mmn}
 %%apache_serverroot%{ap_serverroot}
 %%apache_sysconfdir%{ap_sysconfdir}
+%%apache_datadir   %{ap_datadir}
 eom
 
 %install

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org