Hello community, here is the log from the commit of package apache2-mod_security2 for openSUSE:Factory checked in at 2014-11-12 00:21:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_security2 (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_security2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_security2" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_security2/apache2-mod_security2.changes 2014-09-03 19:32:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2-mod_security2.new/apache2-mod_security2.changes 2014-11-12 00:22:22.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 3 09:41:02 UTC 2014 - pgaj...@suse.com + +- call spec-cleaner +- use apache rpm macros + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_security2.spec ++++++ --- /var/tmp/diff_new_pack.QD6gFQ/_old 2014-11-12 00:22:23.000000000 +0100 +++ /var/tmp/diff_new_pack.QD6gFQ/_new 2014-11-12 00:22:23.000000000 +0100 @@ -16,12 +16,31 @@ # +%define modname mod_security2 +%define tarballname modsecurity-%{version} +# +%define usrsharedir %{_datadir}/%{name} +%define refman Reference-Manual.html +%define faq ModSecurity-Frequently-Asked-Questions-FAQ.html Name: apache2-mod_security2 Version: 2.8.0 -Release: 0.1 +Release: 0 # +Summary: ModSecurity Open Source Web Application Firewall +License: Apache-2.0 +Group: Productivity/Networking/Web/Servers # -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://www.modsecurity.org/ +Source: https://www.modsecurity.org/tarball/%{version}/%{tarballname}.tar.gz +Source1: https://github.com/SpiderLabs/owasp-modsecurity-crs/tarball/master//SpiderLabs-owasp-modsecurity-crs-2.2.9-5-gebe8790.tar.gz +Source2: mod_security2.conf +Source3: %{refman}.bz2 +Source4: %{faq}.bz2 +Source5: modsecurity_diagram_apache_request_cycle.jpg +Source6: README-SUSE-mod_security2.txt +Source7: empty.conf +Patch0: apache2-mod_security2-no_rpath.diff +BuildRequires: apache-rpm-macros BuildRequires: apache2-devel BuildRequires: apache2-prefork BuildRequires: autoconf @@ -32,36 +51,11 @@ BuildRequires: libxml2-devel BuildRequires: lua-devel BuildRequires: pcre-devel -%define apache apache2 -%define modname mod_security2 -%define tarballname modsecurity-%{version} -# -%define apxs %{_sbindir}/apxs2 -%define apache_libexecdir %(%{apxs} -q LIBEXECDIR) -%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) -%define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)/MMN; test -x $MMN && $MMN) -%define usrsharedir %{_prefix}/share/%{name} -%define refman Reference-Manual.html -%define faq ModSecurity-Frequently-Asked-Questions-FAQ.html -%if 0%{?apache_mmn} Requires: %{apache_mmn} -%endif Requires: apache2 # -Url: http://www.modsecurity.org/ -Source: https://www.modsecurity.org/tarball/%{version}/%{tarballname}.tar.gz -Source1: https://github.com/SpiderLabs/owasp-modsecurity-crs/tarball/master//SpiderLabs-owasp-modsecurity-crs-2.2.9-5-gebe8790.tar.gz -Source2: mod_security2.conf -Source3: %{refman}.bz2 -Source4: %{faq}.bz2 -Source5: modsecurity_diagram_apache_request_cycle.jpg -Source6: README-SUSE-mod_security2.txt -Source7: empty.conf -Patch0: apache2-mod_security2-no_rpath.diff # -Summary: ModSecurity Open Source Web Application Firewall -License: Apache-2.0 -Group: Productivity/Networking/Web/Servers +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ModSecurity(TM) is an open source intrusion detection and prevention @@ -73,10 +67,9 @@ The modsecurity team also offer a commercial version of their excellent ruleset. Please have a look at http://www.modsecurity.org/ for more details. - %prep -%setup -n %{tarballname} -%setup -D -T -a 1 -n %{tarballname} +%setup -q -n %{tarballname} +%setup -q -D -T -a 1 -n %{tarballname} mv -v SpiderLabs* rules bzip2 -dc %{SOURCE3} > %{_sourcedir}/%{refman} && touch -r %{SOURCE3} %{_sourcedir}/%{refman} bzip2 -dc %{SOURCE4} > %{_sourcedir}/%{faq} && touch -r %{SOURCE4} %{_sourcedir}/%{faq} @@ -93,11 +86,11 @@ autoreconf -fi %endif automake -./configure --with-apxs=%{apxs} --enable-request-early --enable-htaccess-config +./configure --with-apxs=%{apache_apxs} --enable-request-early --enable-htaccess-config CFLAGS="%{optflags}" make %{?_smp_mflags} %install -pushd %{apache} +pushd apache2 install -d -m 0755 %{buildroot}%{apache_libexecdir} install .libs/mod_security2.so %{buildroot}%{apache_libexecdir}/%{modname}.so popd @@ -124,10 +117,6 @@ mv %{buildroot}/%{usrsharedir}/rules/modsecurity_crs_10_setup.conf.example \ %{buildroot}/%{usrsharedir}/rules/modsecurity_crs_10_setup.conf -%clean -%{__rm} -rf %{buildroot}; -%{__rm} -f %{_sourcedir}/%{faq} %{_sourcedir}/%{refman} - %files %defattr(-, root, root, 0755) %{apache_libexecdir}/%{modname}.so -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org