# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346171535 -7200 # Node ID 9d786c9d3d159732ca577fca60d6c9daebac83e0 # Parent 412e528abcd17e5d19c749774441d2343b72b922 Update version, leverage pkg-config(1) for integration, modify dependency accordingly, correct nonportable use of u_int types, and modernize packaging. diff -r 412e528abcd1 -r 9d786c9d3d15 webalizer/webalizer.spec --- a/webalizer/webalizer.spec Tue Aug 28 18:32:10 2012 +0200 +++ b/webalizer/webalizer.spec Tue Aug 28 18:32:15 2012 +0200 @@ -22,9 +22,9 @@ ## # package version -%define V_real 2.21-02 -%define V_here 2.21.02 -%define V_geodb 20090401 +%define V_real 2.23-05 +%define V_here 2.23.05 +%define V_geodb 20120801 # package information Name: webalizer @@ -37,7 +37,7 @@ Group: Logfile License: GPL Version: %{V_here} -Release: 20090418 +Release: 20120800 # package options %option with_dns no @@ -53,11 +53,9 @@ Patch0: webalizer.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130 -PreReq: OpenPKG, openpkg >= 20040130 -BuildPreReq: gd, png, zlib, bzip2, db >= 4.1.24 +BuildPreReq: OpenPKG, openpkg >= 20100101 +PreReq: OpenPKG, openpkg >= 20100101 +BuildPreReq: gd, png, zlib, bzip2, db >= 4.1.24, pkgconfig PreReq: gd, png, zlib, bzip2, db >= 4.1.24 %if "%{with_dns}" == "yes" BuildPreReq: db::with_compat = yes @@ -67,8 +65,6 @@ BuildPreReq: geoip PreReq: geoip %endif -AutoReq: no -AutoReqProv: no %description The Webalizer is a fast, free web server log file analysis program. @@ -93,6 +89,13 @@ -e "s;@l_gwidth@;%{with_gwidth};g" \ graphs.c \ output.c + %{l_shtool} subst \ + -e 's;u_int64_t;uint64_t;g' \ + *.c *.h configure + %{l_shtool} subst \ + -e "s;\(\${LIBS}\);\1 `%{l_prefix}/bin/pkg-config --libs-only-l db`;g" \ + -e "s;\(\${WCMGR_LIBS}\);\1 `%{l_prefix}/bin/pkg-config --libs-only-l db`;g" \ + Makefile.in %build CC="%{l_cc}" \ @@ -124,7 +127,6 @@ %{l_make} %{l_mflags -O} %install - rm -rf $RPM_BUILD_ROOT %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/bin \ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \ @@ -155,5 +157,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT