1.1 --- a/webalizer/webalizer.spec Tue Aug 28 18:32:10 2012 +0200
1.2 +++ b/webalizer/webalizer.spec Tue Aug 28 18:32:15 2012 +0200
1.3 @@ -22,9 +22,9 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_real 2.21-02
1.8 -%define V_here 2.21.02
1.9 -%define V_geodb 20090401
1.10 +%define V_real 2.23-05
1.11 +%define V_here 2.23.05
1.12 +%define V_geodb 20120801
1.13
1.14 # package information
1.15 Name: webalizer
1.16 @@ -37,7 +37,7 @@
1.17 Group: Logfile
1.18 License: GPL
1.19 Version: %{V_here}
1.20 -Release: 20090418
1.21 +Release: 20120800
1.22
1.23 # package options
1.24 %option with_dns no
1.25 @@ -53,11 +53,9 @@
1.26 Patch0: webalizer.patch
1.27
1.28 # build information
1.29 -Prefix: %{l_prefix}
1.30 -BuildRoot: %{l_buildroot}
1.31 -BuildPreReq: OpenPKG, openpkg >= 20040130
1.32 -PreReq: OpenPKG, openpkg >= 20040130
1.33 -BuildPreReq: gd, png, zlib, bzip2, db >= 4.1.24
1.34 +BuildPreReq: OpenPKG, openpkg >= 20100101
1.35 +PreReq: OpenPKG, openpkg >= 20100101
1.36 +BuildPreReq: gd, png, zlib, bzip2, db >= 4.1.24, pkgconfig
1.37 PreReq: gd, png, zlib, bzip2, db >= 4.1.24
1.38 %if "%{with_dns}" == "yes"
1.39 BuildPreReq: db::with_compat = yes
1.40 @@ -67,8 +65,6 @@
1.41 BuildPreReq: geoip
1.42 PreReq: geoip
1.43 %endif
1.44 -AutoReq: no
1.45 -AutoReqProv: no
1.46
1.47 %description
1.48 The Webalizer is a fast, free web server log file analysis program.
1.49 @@ -93,6 +89,13 @@
1.50 -e "s;@l_gwidth@;%{with_gwidth};g" \
1.51 graphs.c \
1.52 output.c
1.53 + %{l_shtool} subst \
1.54 + -e 's;u_int64_t;uint64_t;g' \
1.55 + *.c *.h configure
1.56 + %{l_shtool} subst \
1.57 + -e "s;\(\${LIBS}\);\1 `%{l_prefix}/bin/pkg-config --libs-only-l db`;g" \
1.58 + -e "s;\(\${WCMGR_LIBS}\);\1 `%{l_prefix}/bin/pkg-config --libs-only-l db`;g" \
1.59 + Makefile.in
1.60
1.61 %build
1.62 CC="%{l_cc}" \
1.63 @@ -124,7 +127,6 @@
1.64 %{l_make} %{l_mflags -O}
1.65
1.66 %install
1.67 - rm -rf $RPM_BUILD_ROOT
1.68 %{l_shtool} mkdir -f -p -m 755 \
1.69 $RPM_BUILD_ROOT%{l_prefix}/bin \
1.70 $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
1.71 @@ -155,5 +157,4 @@
1.72 %files -f files
1.73
1.74 %clean
1.75 - rm -rf $RPM_BUILD_ROOT
1.76
