1.1 --- a/rrdtool/rrdtool.spec Wed Aug 08 20:29:13 2012 +0200
1.2 +++ b/rrdtool/rrdtool.spec Wed Aug 08 20:31:17 2012 +0200
1.3 @@ -1,6 +1,6 @@
1.4 ##
1.5 ## rrdtool.spec -- OpenPKG RPM Package Specification
1.6 -## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/>
1.7 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
1.8 ##
1.9 ## Permission to use, copy, modify, and distribute this software for
1.10 ## any purpose with or without fee is hereby granted, provided that
1.11 @@ -23,7 +23,7 @@
1.12
1.13 # package version
1.14 %define V_rrdtool 1.4.7
1.15 -%define V_rrdtool_oo 0.31
1.16 +%define V_rrdtool_oo 0.32
1.17 %define V_rrdtool_creator 1.0
1.18 %define V_rrd_simple 1.44
1.19
1.20 @@ -38,7 +38,7 @@
1.21 Group: Database
1.22 License: LGPL
1.23 Version: %{V_rrdtool}
1.24 -Release: 20120208
1.25 +Release: 20120308
1.26
1.27 # package options
1.28 %option with_perl no
1.29 @@ -52,10 +52,8 @@
1.30 Patch0: rrdtool.patch
1.31
1.32 # build information
1.33 -Prefix: %{l_prefix}
1.34 -BuildRoot: %{l_buildroot}
1.35 -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module
1.36 -PreReq: OpenPKG, openpkg >= 20040130
1.37 +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc, make, pkgconfig, perl-openpkg >= 5.8.3-20040126, perl-module, intltool
1.38 +PreReq: OpenPKG, openpkg >= 20100101
1.39 BuildPreReq: png, zlib, freetype, pango, cairo, libxml
1.40 PreReq: png, zlib, freetype, pango, cairo, libxml
1.41 %if "%{with_perl}" == "yes"
1.42 @@ -66,8 +64,6 @@
1.43 BuildPreReq: python
1.44 PreReq: python
1.45 %endif
1.46 -AutoReq: no
1.47 -AutoReqProv: no
1.48
1.49 %description
1.50 RRD is the Acronym for Round Robin Database. RRD is a system
1.51 @@ -107,25 +103,17 @@
1.52 %setup -q -D -T -a 2
1.53 %setup -q -D -T -a 3
1.54 %patch -p0
1.55 - %{l_shtool} subst \
1.56 - -e 's;\-std=c99 *;;g' \
1.57 - configure
1.58 - %{l_shtool} subst \
1.59 - -e 's;@l_pangocairo@;`pkg-config pangocairo --libs-only-l`;' \
1.60 - bindings/perl-shared/Makefile.PL
1.61 rm -f bindings/perl-shared/ntmake.pl
1.62 rm -rf RRDTool-Creator-*/_build
1.63
1.64 %build
1.65 # configure package
1.66 - ( echo "ac_cv_path_PERL=no"
1.67 - echo "ac_cv_have_broken_isfinite=yes"
1.68 - ) >config.cache
1.69 + echo "ac_cv_path_PERL=no" >config.cache
1.70 CC="%{l_cc}" \
1.71 CPPFLAGS="%{l_cppflags}" \
1.72 CFLAGS="%{l_cflags -O}" \
1.73 LDLAGS="%{l_ldflags}" \
1.74 - LIBS="`pkg-config pangocairo --libs-only-l`" \
1.75 + LIBS="`pkg-config pangocairo --libs`" \
1.76 ./configure \
1.77 --cache-file=./config.cache \
1.78 --prefix=%{l_prefix} \
1.79 @@ -138,6 +126,7 @@
1.80 --disable-tcl \
1.81 --disable-ruby \
1.82 --disable-shared \
1.83 + --disable-nls \
1.84 --enable-rrdcgi
1.85
1.86 # build package
1.87 @@ -154,14 +143,13 @@
1.88 %endif
1.89
1.90 %install
1.91 - rm -rf $RPM_BUILD_ROOT
1.92
1.93 # install package
1.94 %{l_shtool} subst \
1.95 -e 's/^\(install-data-am:\).*/\1/' \
1.96 Makefile
1.97 %{l_make} %{l_mflags} install \
1.98 - DESTDIR=$RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT"
1.99 + DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
1.100
1.101 # install Perl part
1.102 %if "%{with_perl}" == "yes"
1.103 @@ -196,5 +184,4 @@
1.104 %files -f files
1.105
1.106 %clean
1.107 - rm -rf $RPM_BUILD_ROOT
1.108
