Hello community,
here is the log from the commit of package apache2-mod_tidy for
openSUSE:Factory checked in at 2014-11-12 00:22:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_tidy (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_tidy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_tidy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_tidy/apache2-mod_tidy.changes
2012-02-21 12:15:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.apache2-mod_tidy.new/apache2-mod_tidy.changes
2014-11-12 00:22:23.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 3 09:47:40 UTC 2014 - pgaj...@suse.com
+
+- call spec-cleaner
+- use apache rpm macros
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_tidy.spec ++++++
--- /var/tmp/diff_new_pack.DCmWDb/_old 2014-11-12 00:22:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DCmWDb/_new 2014-11-12 00:22:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_tidy
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,29 +16,26 @@
#
-Name: apache2-mod_tidy
-BuildRequires: apache2-devel
-BuildRequires: libtidy-devel
-Version: 0.5.5
-Release: 0
########################################
# apache macros
########################################
%define modname mod_tidy
-%define apxs %{_sbindir}/apxs2
-%define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN &&
$MMN)
-%define apache_libexecdir %(%{apxs} -q LIBEXECDIR)
-%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR)
-%define apache_includedir %(%{apxs} -q INCLUDEDIR)
+Name: apache2-mod_tidy
+Version: 0.5.5
+Release: 0
###
###
Summary: Apache Module using the Tidy Library to Clean Up HTML, XHTML,
and XML
License: Apache-2.0
Group: Productivity/Networking/Web/Utilities
-Requires: apache2 %{apache_mmn}
Url: http://mod-tidy.sourceforge.net/
Source0: http://mod-tidy.sourceforge.net/src/mod_tidy-%{version}.tar.gz
Source1: %{modname}-suse-addons.tar.bz2
+BuildRequires: apache-rpm-macros
+BuildRequires: apache2-devel
+BuildRequires: libtidy-devel
+Requires: %{apache_mmn}
+Requires: apache2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -52,7 +49,7 @@
To load the module into Apache, run the command "a2enmod tidy" as root.
To learn about the configuration, refer to
-/usr/share/doc/packages/apache2-mod_tidy/README.
+%{_docdir}/apache2-mod_tidy/README.
%prep
%setup -q -n %{modname}-%{version} -a 1
@@ -61,21 +58,21 @@
# APR uses pre-installed TidyLib instead of the packaged one
export CFLAGS="$CFLAGS -I%{_includedir}/tidy"
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/tidy"
-%{apxs} -I%{_includedir}/tidy \
+%{apache_apxs} -I%{_includedir}/tidy \
-c src/%{modname}.c \
-ltidy
-%configure --with-apxs=%{apxs} \
+%configure --with-apxs=%{apache_apxs} \
--with-tidy=%{_libdir}
# RPM_OPT_FLAGS come from apxs
-make OPT="$(%{apxs} -q CFLAGS)" %{?_smp_mflags}
+make OPT="%{apache_cflags}" %{?_smp_mflags}
%install
-install -Dpm 755 src/.libs/mod_tidy.so
$RPM_BUILD_ROOT%{apache_libexecdir}/%{modname}.so
-install -Dpm 644 mod_tidy.conf
$RPM_BUILD_ROOT%{apache_sysconfdir}/%{modname}.conf
+install -Dpm 755 src/.libs/mod_tidy.so
%{buildroot}%{apache_libexecdir}/%{modname}.so
+install -Dpm 644 mod_tidy.conf %{buildroot}%{apache_sysconfdir}/%{modname}.conf
mv %{modname}-suse-addons/README.SUSE .
%post
-echo -e "\nTo load %{modname} into Apache, add tidy to APACHE_MODULES in
/etc/sysconfig/apache2."
+echo -e "\nTo load %{modname} into Apache, add tidy to APACHE_MODULES in
%{_sysconfdir}/sysconfig/apache2."
echo -e "Please read %{_defaultdocdir}/%{name}/README.SUSE for further
configuration hints."
echo -e "Finally, restart the webserver with 'rcapache2 graceful'.\n"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
