wok rev 23618

updated rrdtool packages (1.6.0 -> 1.7.2)
author Hans-G?nter Theisgen
date Tue Apr 14 11:28:26 2020 +0100 (2020-04-14)
parents 27198696acb7
children 290e737cb4f9
files rpm4/receipt rrdtool-dev/receipt rrdtool-doc/receipt rrdtool-lite/receipt rrdtool-man/receipt rrdtool-perl/receipt rrdtool-python/receipt rrdtool/receipt
line diff
     1.1 --- a/rpm4/receipt	Tue Apr 14 10:40:48 2020 +0100
     1.2 +++ b/rpm4/receipt	Tue Apr 14 11:28:26 2020 +0100
     1.3 @@ -42,7 +42,6 @@
     1.4  genpkg_rules()
     1.5  {
     1.6  	mkdir -p \
     1.7 -		$fs/usr/bin \
     1.8  		$fs/usr/lib \
     1.9  		$fs/var/lib/rpm \
    1.10  		$fs/usr/src/redhat/SOURCES \
    1.11 @@ -52,7 +51,7 @@
    1.12  		$fs/usr/src/redhat/SRPMS
    1.13  
    1.14  	cp -a $install/usr/bin		$fs/usr
    1.15 -	cp -a $install/bin/*		$fs/usr/bin
    1.16 +#	cp -a $install/bin/*		$fs/usr/bin
    1.17  	cp -a $install/usr/lib/*.so*	$fs/usr/lib
    1.18  	cp -a $install/usr/lib/rpm	$fs/usr/lib
    1.19  }
     2.1 --- a/rrdtool-dev/receipt	Tue Apr 14 10:40:48 2020 +0100
     2.2 +++ b/rrdtool-dev/receipt	Tue Apr 14 11:28:26 2020 +0100
     2.3 @@ -1,21 +1,21 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="rrdtool-dev"
     2.7 -VERSION="1.6.0"
     2.8 +VERSION="1.7.2"
     2.9  CATEGORY="development"
    2.10 -SHORT_DESC="Data logging and graphing system for time series data, development file."
    2.11 +SHORT_DESC="Data logging and graphing system for time series data, development files."
    2.12  MAINTAINER="pascal.bellard@slitaz.org"
    2.13  LICENSE="GPL2"
    2.14 -WEB_SITE="http://oss.oetiker.ch/rrdtool"
    2.15 -WANTED="rrdtool"
    2.16 +WEB_SITE="https://oss.oetiker.ch/rrdtool"
    2.17  
    2.18  DEPENDS="rrdtool"
    2.19 +WANTED="rrdtool"
    2.20  
    2.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.22  genpkg_rules()
    2.23  {
    2.24  	mkdir -p $fs/usr/lib
    2.25 -	cp -a $install/usr/lib/*.a $fs/usr/lib
    2.26 -	cp -a $install/usr/include $fs/usr
    2.27 +
    2.28 +	cp -a $install/usr/lib/*.a	$fs/usr/lib
    2.29 +	cp -a $install/usr/include	$fs/usr
    2.30  }
    2.31 -
     3.1 --- a/rrdtool-doc/receipt	Tue Apr 14 10:40:48 2020 +0100
     3.2 +++ b/rrdtool-doc/receipt	Tue Apr 14 11:28:26 2020 +0100
     3.3 @@ -1,19 +1,20 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="rrdtool-doc"
     3.7 -VERSION="1.6.0"
     3.8 +VERSION="1.7.2"
     3.9  CATEGORY="development"
    3.10 -SHORT_DESC="Data logging and graphing system for time series data."
    3.11 +SHORT_DESC="Data logging and graphing system for time series data - documentation."
    3.12  MAINTAINER="pascal.bellard@slitaz.org"
    3.13  LICENSE="GPL2"
    3.14 -WEB_SITE="http://oss.oetiker.ch/rrdtool"
    3.15 +WEB_SITE="https://oss.oetiker.ch/rrdtool"
    3.16 +
    3.17  WANTED="rrdtool"
    3.18  
    3.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.20  genpkg_rules()
    3.21  {
    3.22  	mkdir -p $fs/usr/share
    3.23 -	cp -a $install/usr/share/rrdtool $fs/usr/share
    3.24 -	cp -a $install/usr/share/doc $fs/usr/share
    3.25 +
    3.26 +	cp -a $install/usr/share/rrdtool	$fs/usr/share
    3.27 +	cp -a $install/usr/share/doc		$fs/usr/share
    3.28  }
    3.29 -
     4.1 --- a/rrdtool-lite/receipt	Tue Apr 14 10:40:48 2020 +0100
     4.2 +++ b/rrdtool-lite/receipt	Tue Apr 14 11:28:26 2020 +0100
     4.3 @@ -1,35 +1,40 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="rrdtool-lite"
     4.7 -SOURCE="rrdtool"
     4.8 -VERSION="1.6.0"
     4.9 +VERSION="1.7.2"
    4.10  CATEGORY="misc"
    4.11 +TAGS="logs"
    4.12  SHORT_DESC="Data logging system for time series data."
    4.13  MAINTAINER="pascal.bellard@slitaz.org"
    4.14 +WEB_SITE="https://oss.oetiker.ch/rrdtool/"
    4.15 +
    4.16 +SOURCE="rrdtool"
    4.17  TARBALL="$SOURCE-$VERSION.tar.gz"
    4.18 -WEB_SITE="http://oss.oetiker.ch/$SOURCE"
    4.19 -WGET_URL="$WEB_SITE/pub/$TARBALL"
    4.20 +WGET_URL="${WEB_SITE}pub/$TARBALL"
    4.21 +
    4.22 +DEPENDS="glib libxml2 zlib"
    4.23 +BUILD_DEPENDS="glib-dev groff libxml2-dev pkg-config"
    4.24 +
    4.25  HOST_ARCH="i486 arm"
    4.26  
    4.27 -DEPENDS="zlib glib libxml2"
    4.28 -BUILD_DEPENDS="pkg-config libxml2-dev glib-dev groff"
    4.29 -TAGS="logs"
    4.30 -
    4.31  # Rules to configure and make the package.
    4.32  compile_rules()
    4.33  {
    4.34 -	./configure --prefix=/usr --infodir=/usr/share/info \
    4.35 -		--disable-rrdcgi \
    4.36 -		--disable-rrd_graph \
    4.37 -		--disable-nls \
    4.38 -		--disable-libdbi \
    4.39 -		--disable-libwrap \
    4.40 -		--disable-perl \
    4.41 -		--disable-ruby \
    4.42 -		--disable-lua \
    4.43 -		--disable-tcl \
    4.44 -		--disable-python \
    4.45 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    4.46 +	./configure				\
    4.47 +		--prefix=/usr			\
    4.48 +		--infodir=/usr/share/info	\
    4.49 +		--disable-rrdcgi		\
    4.50 +		--disable-rrd_graph		\
    4.51 +		--disable-nls			\
    4.52 +		--disable-libdbi		\
    4.53 +		--disable-libwrap		\
    4.54 +		--disable-perl			\
    4.55 +		--disable-ruby			\
    4.56 +		--disable-lua			\
    4.57 +		--disable-tcl			\
    4.58 +		--disable-python		\
    4.59 +		--mandir=/usr/share/man		\
    4.60 +		$CONFIGURE_ARGS &&
    4.61  	make &&
    4.62  	make DESTDIR=$DESTDIR install
    4.63  }
    4.64 @@ -38,6 +43,7 @@
    4.65  genpkg_rules()
    4.66  {
    4.67  	mkdir -p $fs/usr/lib
    4.68 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    4.69 -	cp -a $install/usr/bin $fs/usr
    4.70 +
    4.71 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
    4.72 +	cp -a $install/usr/bin		$fs/usr
    4.73  }
     5.1 --- a/rrdtool-man/receipt	Tue Apr 14 10:40:48 2020 +0100
     5.2 +++ b/rrdtool-man/receipt	Tue Apr 14 11:28:26 2020 +0100
     5.3 @@ -1,18 +1,18 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="rrdtool-man"
     5.7 -VERSION="1.6.0"
     5.8 +VERSION="1.7.2"
     5.9  CATEGORY="development"
    5.10 -SHORT_DESC="Data logging and graphing system for time series data."
    5.11 +SHORT_DESC="Data logging and graphing system for time series data - manual pages."
    5.12  MAINTAINER="pascal.bellard@slitaz.org"
    5.13  LICENSE="GPL2"
    5.14 -WEB_SITE="http://oss.oetiker.ch/rrdtool"
    5.15 +WEB_SITE="https://oss.oetiker.ch/rrdtool/"
    5.16 +
    5.17  WANTED="rrdtool"
    5.18  
    5.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.20  genpkg_rules()
    5.21  {
    5.22  	mkdir -p $fs/usr/share
    5.23 -	cp -a $install/usr/share/man $fs/usr/share
    5.24 +	cp -a $install/usr/share/man	$fs/usr/share
    5.25  }
    5.26 -
     6.1 --- a/rrdtool-perl/receipt	Tue Apr 14 10:40:48 2020 +0100
     6.2 +++ b/rrdtool-perl/receipt	Tue Apr 14 11:28:26 2020 +0100
     6.3 @@ -1,20 +1,19 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="rrdtool-perl"
     6.7 -VERSION="1.6.0"
     6.8 +VERSION="1.7.2"
     6.9  CATEGORY="development"
    6.10  SHORT_DESC="Perl bindings for rrdtool."
    6.11  MAINTAINER="pascal.bellard@slitaz.org"
    6.12  LICENSE="GPL2"
    6.13  WEB_SITE="http://oss.oetiker.ch/rrdtool"
    6.14 -WANTED="rrdtool"
    6.15  
    6.16  DEPENDS="perl rrdtool"
    6.17 +WANTED="rrdtool"
    6.18  
    6.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.20  genpkg_rules()
    6.21  {
    6.22  	mkdir -p $fs/usr/lib
    6.23 -	cp -a $install/usr/lib/perl5 $fs/usr/lib/
    6.24 +	cp -a $install/usr/lib/perl5	$fs/usr/lib/
    6.25  }
    6.26 -
     7.1 --- a/rrdtool-python/receipt	Tue Apr 14 10:40:48 2020 +0100
     7.2 +++ b/rrdtool-python/receipt	Tue Apr 14 11:28:26 2020 +0100
     7.3 @@ -1,21 +1,21 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="rrdtool-python"
     7.7 -VERSION="1.6.0"
     7.8 +VERSION="1.7.2"
     7.9  CATEGORY="development"
    7.10  SHORT_DESC="Python bindings for rrdtool."
    7.11  MAINTAINER="pascal.bellard@slitaz.org"
    7.12  LICENSE="GPL2"
    7.13 -WEB_SITE="http://oss.oetiker.ch/rrdtool"
    7.14 -WANTED="rrdtool"
    7.15 +WEB_SITE="https://oss.oetiker.ch/rrdtool/"
    7.16  
    7.17  DEPENDS="python rrdtool"
    7.18 +WANTED="rrdtool"
    7.19  
    7.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.21  genpkg_rules()
    7.22  {
    7.23  	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
    7.24 +
    7.25  	mkdir -p $fs/usr/lib
    7.26 -	cp -a $install/usr/lib/$PYTHON_LIB $fs/usr/lib
    7.27 +	cp -a $install/usr/lib/$PYTHON_LIB	$fs/usr/lib
    7.28  }
    7.29 -
     8.1 --- a/rrdtool/receipt	Tue Apr 14 10:40:48 2020 +0100
     8.2 +++ b/rrdtool/receipt	Tue Apr 14 11:28:26 2020 +0100
     8.3 @@ -1,30 +1,34 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="rrdtool"
     8.7 -VERSION="1.6.0"
     8.8 +VERSION="1.7.2"
     8.9  CATEGORY="misc"
    8.10 +TAGS="logs"
    8.11  SHORT_DESC="Data logging and graphing system for time series data."
    8.12  MAINTAINER="pascal.bellard@slitaz.org"
    8.13  LICENSE="GPL2"
    8.14 +WEB_SITE="https://oss.oetiker.ch/rrdtool/"
    8.15 +
    8.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    8.17 -WEB_SITE="http://oss.oetiker.ch/$PACKAGE"
    8.18 -WGET_URL="$WEB_SITE/pub/$TARBALL"
    8.19 +WGET_URL="${WEB_SITE}pub/$TARBALL"
    8.20  
    8.21 -DEPENDS="zlib freetype libpng libxml2 fontconfig pixman cairo glib pango \
    8.22 -xcb-util xorg-base-fonts libwrap"
    8.23 -BUILD_DEPENDS="perl pkg-config zlib-dev freetype-dev libpng-dev libxml2-dev \
    8.24 -fontconfig-dev pixman-dev cairo-dev glib-dev pango-dev python-dev perl groff \
    8.25 -libwrap-dev tcl-dev lua-dev ruby"
    8.26 -TAGS="logs"
    8.27 +DEPENDS="cairo fontconfig freetype glib libpng libwrap libxml2 pango pixman 
    8.28 +	xcb-util xorg-base-fonts zlib"
    8.29 +BUILD_DEPENDS="cairo-dev fontconfig-dev freetype-dev glib-dev groff 
    8.30 +	libpng-dev libwrap-dev libxml2-dev lua-dev pango-dev perl pixman-dev 
    8.31 +	pkg-config python-dev python-setuptools ruby tcl-dev zlib-dev"
    8.32  
    8.33  # Rules to configure and make the package.
    8.34  compile_rules()
    8.35  {
    8.36  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lz"
    8.37 -	./configure --prefix=/usr \
    8.38 -		--infodir=/usr/share/info \
    8.39 -		--enable-perl-site-install \
    8.40 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    8.41 +
    8.42 +	./configure				\
    8.43 +		--prefix=/usr			\
    8.44 +		--infodir=/usr/share/info	\
    8.45 +		--enable-perl-site-install	\
    8.46 +		--mandir=/usr/share/man		\
    8.47 +		$CONFIGURE_ARGS &&
    8.48  	make &&
    8.49  	make DESTDIR=$DESTDIR install
    8.50  }
    8.51 @@ -33,8 +37,9 @@
    8.52  genpkg_rules()
    8.53  {
    8.54  	mkdir -p $fs/usr/lib
    8.55 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    8.56 +
    8.57 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
    8.58  	# librrd_th.so has gone since librrd.so is thread safe
    8.59 -	ln -s librrd.so $fs/usr/lib/librrd_th.so
    8.60 -	cp -a $install/usr/bin $fs/usr
    8.61 +	ln -s librrd.so			$fs/usr/lib/librrd_th.so
    8.62 +	cp -a $install/usr/bin		$fs/usr
    8.63  }