- use apache1(EAPI) for runtime dep

[packages/apache1-mod_ometer.git] / apache1-mod_ometer.spec

diff --git a/apache1-mod_ometer.spec b/apache1-mod_ometer.spec
index 200cce318eaed65aef7794417b9f2f0a2296fbb1..ee88ae38f6ecc69f984f2b91d054cd585ac38a37 100644 (file)
--- a/apache1-mod_ometer.spec
+++ b/apache1-mod_ometer.spec
@@ -1,26 +1,32 @@
+# TODO
+#  - doesn't build. see rev 1.11

 %define                mod_name        ometer
 %define                mod_name        ometer

-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1

 Summary:       Apache module: Web counter
 Summary:       Apache module: Web counter

-Summary(pl):   Modu³ do apache: licznik odwiedzin
-Name:          apache-mod_%{mod_name}
+Summary(pl.UTF-8):     Moduł do Apache: licznik odwiedzin
+Name:          apache1-mod_%{mod_name}

 Version:       1.2.0
 Version:       1.2.0

-Release:       1
+Release:       0.4

 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.umich.edu/~umweb/downloads/mod_%{mod_name}-%{version}.tar.gz
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.umich.edu/~umweb/downloads/mod_%{mod_name}-%{version}.tar.gz

+# Source0-md5: 50b7b641409abd5d1a57077422fd444e
+Source1:       %{name}.conf
+Source2:       http://www.umich.edu/~umweb/how-to/cgi-scripts/counter.html
+# Source2-md5: 6d6f56cec95c5fa2a28caf0ecb86b034

 Patch0:                %{name}-configure.patch
 Patch0:                %{name}-configure.patch

+Patch1:                %{name}-symbols.patch

 URL:           http://modometer.org/
 URL:           http://modometer.org/

-BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-devel >= 1.3.39
+BuildRequires: gd-devel

 BuildRequires: libjpeg-devel
 BuildRequires: libjpeg-devel

-Requires(post,preun):  %{apxs}
-Requires(post,preun):  grep
-Requires(preun):       fileutils
-Requires:      apache(EAPI)
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache1(EAPI)
+Obsoletes:     apache-mod_ometer <= 1.2.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define         _sysconfdir     /etc/httpd
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)

 
 %description
 mod_ometer is a Web counter implemented as an Apache C module. It uses
 
 %description
 mod_ometer is a Web counter implemented as an Apache C module. It uses


@@ -30,46 +36,50 @@ font choice, mod_ometer has all sorts of options for customizing the
 size, width, and color of your counter, as well as the ability to
 output the counter as JPEG or PNG.
 
 size, width, and color of your counter, as well as the ability to
 output the counter as JPEG or PNG.
 

-%description -l pl
-mod_ometer jest licznikiem odwiedzin dzia³aj±cym jako modu³ Apacze'a
-u¿ywaj±cym biblioteki gd generowania obrazków. gd posiada kilka
-wbudowanych fontów, lecz w liczniku mo¿na u¿yæ dowolnych fontów
-TrueType. Poza mo¿liwo¶ci± wyboru kroju czcionki mod_ometer posiada
-opcje umo¿liwiaj±ce zmianê szeroko¶ci, wyskoko¶ci i kolorów licznika
+%description -l pl.UTF-8
+mod_ometer jest licznikiem odwiedzin działającym jako moduł Apache'a
+używającym biblioteki gd do generowania obrazków. gd posiada kilka
+wbudowanych fontów, lecz w liczniku można użyć dowolnych fontów
+TrueType. Poza możliwością wyboru kroju czcionki mod_ometer posiada
+opcje umożliwiające zmianę szerokości, wysokości i kolorów licznika

 oraz formatu obrazka: JPEG lub PNG.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 oraz formatu obrazka: JPEG lub PNG.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1

+%patch1 -p1
+cp %{SOURCE2} .

 
 %build
 export LDFLAGS=" "
 
 %build
 export LDFLAGS=" "

-%configure
-%{__make}
+
+%configure \
+       apxspath=%{apxs} \
+       found_apache=yes \
+
+%{__make} \
+       CFLAGS="%{rpmcflags} -I$(%{apxs} -q INCLUDEDIR CFLAGS)"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}

 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}

+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post

-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q apache restart

 
 

-%preun
+%postun

 if [ "$1" = "0" ]; then
 if [ "$1" = "0" ]; then

-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q apache restart

 fi
 
 %files
 %defattr(644,root,root,755)
 fi
 
 %files
 %defattr(644,root,root,755)

+%doc *.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf

 %attr(755,root,root) %{_pkglibdir}/*
 %attr(755,root,root) %{_pkglibdir}/*