From ed97ece39f5c93cee12f9af2a75638cbe033132923670547f3000e17e6c38500 Mon Sep 17 00:00:00 2001 From: Anna Maresova Date: Fri, 16 Apr 2010 17:45:06 +0000 Subject: [PATCH 1/5] - fixed bnc#594981 (-double.diff) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=6 --- rrdtool.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rrdtool.spec b/rrdtool.spec index 4b166ce..a1bd7f1 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -25,10 +25,10 @@ Group: Productivity/Scientific/Math AutoReqProv: on Requires: perl = %{perl_version} Version: 1.4.3 -Release: 2 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: cgilib-0.5.tar.bz2 -Patch: %{name}-%{version}-double.diff +Patch: %{name}-%{version}-double.diff Url: http://oss.oetiker.ch/rrdtool/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A tool for data logging and analysis From 41f43ed0e2b630270a8c8542f8407dbc44199918b6a7ad01f8dab6ec96104a31 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 18 Apr 2010 22:18:29 +0000 Subject: [PATCH 2/5] checked in (request 38070) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=7 --- rrdtool-1.4.3-double.diff | 13 ------------- rrdtool.changes | 5 ----- rrdtool.spec | 4 +--- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 rrdtool-1.4.3-double.diff diff --git a/rrdtool-1.4.3-double.diff b/rrdtool-1.4.3-double.diff deleted file mode 100644 index b63e224..0000000 --- a/rrdtool-1.4.3-double.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: rrdtool-1.4.3/src/rrd_format.h -=================================================================== ---- rrdtool-1.4.3.orig/src/rrd_format.h -+++ rrdtool-1.4.3/src/rrd_format.h -@@ -35,7 +35,7 @@ - /* changed because microsecond precision requires another field */ - #define RRD_VERSION "0004" - #define RRD_VERSION3 "0003" --#define FLOAT_COOKIE 8.642135E130 -+#define FLOAT_COOKIE ((double) 8.642135E130) - - typedef union unival { - unsigned long u_cnt; diff --git a/rrdtool.changes b/rrdtool.changes index 95125cd..5b7875e 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Apr 16 19:41:43 CEST 2010 - anicka@suse.cz - -- fixed bnc#594981 (-double.diff) - ------------------------------------------------------------------- Tue Mar 30 18:16:24 CEST 2010 - anicka@suse.cz diff --git a/rrdtool.spec b/rrdtool.spec index a1bd7f1..6ecc7d2 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -28,7 +28,6 @@ Version: 1.4.3 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: cgilib-0.5.tar.bz2 -Patch: %{name}-%{version}-double.diff Url: http://oss.oetiker.ch/rrdtool/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A tool for data logging and analysis @@ -42,12 +41,11 @@ definable time period. %prep %setup -q -a1 -%patch -p1 %build # first prepare cgilib cd cgilib* -make CC=gcc CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -fexcess-precision=fast" +make CC=gcc CFLAGS="$RPM_OPT_FLAGS -fPIC -I." mkdir -p ../lb/include cp *.h ../lb/include mkdir -p ../lb/lib From 4407ace48abd3413451a2e30449f6edc88f478c9a1516dc733e0036d9f52ad4b Mon Sep 17 00:00:00 2001 From: Anna Maresova Date: Tue, 27 Jul 2010 15:34:31 +0000 Subject: [PATCH 3/5] - update to 1.4.4 * legal: Relicense the RRDCacheD client interface under the MIT license * legal: Updted FLOSS Exception for latest PHP license * rrd_cached: better help output * bugfixes - remove last patch, fixed in upstream - disable calling autoreconf (needs too new gettext) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=8 --- rrdtool-1.4.3.tar.bz2 | 3 --- rrdtool-1.4.4.tar.bz2 | 3 +++ rrdtool.changes | 17 +++++++++++++++++ rrdtool.spec | 9 +++++---- 4 files changed, 25 insertions(+), 7 deletions(-) delete mode 100644 rrdtool-1.4.3.tar.bz2 create mode 100644 rrdtool-1.4.4.tar.bz2 diff --git a/rrdtool-1.4.3.tar.bz2 b/rrdtool-1.4.3.tar.bz2 deleted file mode 100644 index 90b96f8..0000000 --- a/rrdtool-1.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e936ad51ff1c327caedd24ff65b441c100d70e129962af17c905ca1c1a572ad8 -size 1021895 diff --git a/rrdtool-1.4.4.tar.bz2 b/rrdtool-1.4.4.tar.bz2 new file mode 100644 index 0000000..8152d7d --- /dev/null +++ b/rrdtool-1.4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c73af303eefa96eee3eca02c263d420b03a34032517a23d181d3a5463e9f415b +size 988841 diff --git a/rrdtool.changes b/rrdtool.changes index 5b7875e..cb4b75d 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Jul 27 16:20:46 CEST 2010 - anicka@suse.cz + +- update to 1.4.4 + * legal: Relicense the RRDCacheD client interface under the MIT + license + * legal: Updted FLOSS Exception for latest PHP license + * rrd_cached: better help output + * bugfixes +- remove last patch, fixed in upstream +- disable calling autoreconf (needs too new gettext) + +------------------------------------------------------------------- +Fri Apr 16 19:41:43 CEST 2010 - anicka@suse.cz + +- fixed bnc#594981 (-double.diff) + ------------------------------------------------------------------- Tue Mar 30 18:16:24 CEST 2010 - anicka@suse.cz diff --git a/rrdtool.spec b/rrdtool.spec index 6ecc7d2..27bd874 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -24,8 +24,8 @@ License: GPLv2+ Group: Productivity/Scientific/Math AutoReqProv: on Requires: perl = %{perl_version} -Version: 1.4.3 -Release: 1 +Version: 1.4.4 +Release: 2 Source: %{name}-%{version}.tar.bz2 Source1: cgilib-0.5.tar.bz2 Url: http://oss.oetiker.ch/rrdtool/ @@ -45,7 +45,7 @@ definable time period. %build # first prepare cgilib cd cgilib* -make CC=gcc CFLAGS="$RPM_OPT_FLAGS -fPIC -I." +make CC=gcc CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -fexcess-precision=fast" mkdir -p ../lb/include cp *.h ../lb/include mkdir -p ../lb/lib @@ -54,7 +54,8 @@ cd .. # build rrdtool %{suse_update_config} if [ ! -d m4 ]; then mkdir m4; fi -autoreconf -i -f +# we need getext 0.18 +#autoreconf -i -f export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ %configure --disable-static --with-pic --enable-shared \ --with-tcllib=%{_libdir} \ From fe5b49112e15f45b7b09f71314b71a9c6db7e0cc780f2e9f6ad0c6cda66c47a2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 30 Jul 2010 13:43:45 +0000 Subject: [PATCH 4/5] checked in (request 44080) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=9 --- rrdtool-1.4.3-double.diff | 13 +++++++++++++ rrdtool-1.4.3.tar.bz2 | 3 +++ rrdtool-1.4.4.tar.bz2 | 3 --- rrdtool.changes | 12 ------------ rrdtool.spec | 7 ++++--- 5 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 rrdtool-1.4.3-double.diff create mode 100644 rrdtool-1.4.3.tar.bz2 delete mode 100644 rrdtool-1.4.4.tar.bz2 diff --git a/rrdtool-1.4.3-double.diff b/rrdtool-1.4.3-double.diff new file mode 100644 index 0000000..b63e224 --- /dev/null +++ b/rrdtool-1.4.3-double.diff @@ -0,0 +1,13 @@ +Index: rrdtool-1.4.3/src/rrd_format.h +=================================================================== +--- rrdtool-1.4.3.orig/src/rrd_format.h ++++ rrdtool-1.4.3/src/rrd_format.h +@@ -35,7 +35,7 @@ + /* changed because microsecond precision requires another field */ + #define RRD_VERSION "0004" + #define RRD_VERSION3 "0003" +-#define FLOAT_COOKIE 8.642135E130 ++#define FLOAT_COOKIE ((double) 8.642135E130) + + typedef union unival { + unsigned long u_cnt; diff --git a/rrdtool-1.4.3.tar.bz2 b/rrdtool-1.4.3.tar.bz2 new file mode 100644 index 0000000..90b96f8 --- /dev/null +++ b/rrdtool-1.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e936ad51ff1c327caedd24ff65b441c100d70e129962af17c905ca1c1a572ad8 +size 1021895 diff --git a/rrdtool-1.4.4.tar.bz2 b/rrdtool-1.4.4.tar.bz2 deleted file mode 100644 index 8152d7d..0000000 --- a/rrdtool-1.4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c73af303eefa96eee3eca02c263d420b03a34032517a23d181d3a5463e9f415b -size 988841 diff --git a/rrdtool.changes b/rrdtool.changes index cb4b75d..95125cd 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Tue Jul 27 16:20:46 CEST 2010 - anicka@suse.cz - -- update to 1.4.4 - * legal: Relicense the RRDCacheD client interface under the MIT - license - * legal: Updted FLOSS Exception for latest PHP license - * rrd_cached: better help output - * bugfixes -- remove last patch, fixed in upstream -- disable calling autoreconf (needs too new gettext) - ------------------------------------------------------------------- Fri Apr 16 19:41:43 CEST 2010 - anicka@suse.cz diff --git a/rrdtool.spec b/rrdtool.spec index 27bd874..4b166ce 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -24,10 +24,11 @@ License: GPLv2+ Group: Productivity/Scientific/Math AutoReqProv: on Requires: perl = %{perl_version} -Version: 1.4.4 +Version: 1.4.3 Release: 2 Source: %{name}-%{version}.tar.bz2 Source1: cgilib-0.5.tar.bz2 +Patch: %{name}-%{version}-double.diff Url: http://oss.oetiker.ch/rrdtool/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A tool for data logging and analysis @@ -41,6 +42,7 @@ definable time period. %prep %setup -q -a1 +%patch -p1 %build # first prepare cgilib @@ -54,8 +56,7 @@ cd .. # build rrdtool %{suse_update_config} if [ ! -d m4 ]; then mkdir m4; fi -# we need getext 0.18 -#autoreconf -i -f +autoreconf -i -f export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ %configure --disable-static --with-pic --enable-shared \ --with-tcllib=%{_libdir} \ From 519fe93d00add6866f6c0e5d008b03aa00e4fcf977649a6909bfa58f4407a3d1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 30 Jul 2010 13:43:46 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/rrdtool revision 26.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=ce5c499bfb02087e608691b724b927f1 --- rrdtool-1.4.3-double.diff | 13 ------------- rrdtool-1.4.3.tar.bz2 | 3 --- rrdtool-1.4.4.tar.bz2 | 3 +++ rrdtool.changes | 12 ++++++++++++ rrdtool.spec | 11 +++++------ 5 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 rrdtool-1.4.3-double.diff delete mode 100644 rrdtool-1.4.3.tar.bz2 create mode 100644 rrdtool-1.4.4.tar.bz2 diff --git a/rrdtool-1.4.3-double.diff b/rrdtool-1.4.3-double.diff deleted file mode 100644 index b63e224..0000000 --- a/rrdtool-1.4.3-double.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: rrdtool-1.4.3/src/rrd_format.h -=================================================================== ---- rrdtool-1.4.3.orig/src/rrd_format.h -+++ rrdtool-1.4.3/src/rrd_format.h -@@ -35,7 +35,7 @@ - /* changed because microsecond precision requires another field */ - #define RRD_VERSION "0004" - #define RRD_VERSION3 "0003" --#define FLOAT_COOKIE 8.642135E130 -+#define FLOAT_COOKIE ((double) 8.642135E130) - - typedef union unival { - unsigned long u_cnt; diff --git a/rrdtool-1.4.3.tar.bz2 b/rrdtool-1.4.3.tar.bz2 deleted file mode 100644 index 90b96f8..0000000 --- a/rrdtool-1.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e936ad51ff1c327caedd24ff65b441c100d70e129962af17c905ca1c1a572ad8 -size 1021895 diff --git a/rrdtool-1.4.4.tar.bz2 b/rrdtool-1.4.4.tar.bz2 new file mode 100644 index 0000000..8152d7d --- /dev/null +++ b/rrdtool-1.4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c73af303eefa96eee3eca02c263d420b03a34032517a23d181d3a5463e9f415b +size 988841 diff --git a/rrdtool.changes b/rrdtool.changes index 95125cd..cb4b75d 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jul 27 16:20:46 CEST 2010 - anicka@suse.cz + +- update to 1.4.4 + * legal: Relicense the RRDCacheD client interface under the MIT + license + * legal: Updted FLOSS Exception for latest PHP license + * rrd_cached: better help output + * bugfixes +- remove last patch, fixed in upstream +- disable calling autoreconf (needs too new gettext) + ------------------------------------------------------------------- Fri Apr 16 19:41:43 CEST 2010 - anicka@suse.cz diff --git a/rrdtool.spec b/rrdtool.spec index 4b166ce..bdb3825 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -1,5 +1,5 @@ # -# spec file for package rrdtool (Version 1.4.3) +# spec file for package rrdtool (Version 1.4.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,11 +24,10 @@ License: GPLv2+ Group: Productivity/Scientific/Math AutoReqProv: on Requires: perl = %{perl_version} -Version: 1.4.3 -Release: 2 +Version: 1.4.4 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: cgilib-0.5.tar.bz2 -Patch: %{name}-%{version}-double.diff Url: http://oss.oetiker.ch/rrdtool/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A tool for data logging and analysis @@ -42,7 +41,6 @@ definable time period. %prep %setup -q -a1 -%patch -p1 %build # first prepare cgilib @@ -56,7 +54,8 @@ cd .. # build rrdtool %{suse_update_config} if [ ! -d m4 ]; then mkdir m4; fi -autoreconf -i -f +# we need getext 0.18 +#autoreconf -i -f export LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ %configure --disable-static --with-pic --enable-shared \ --with-tcllib=%{_libdir} \