rpms/rrdtool
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New version

Browse Source 
Resolves: rhbz#1714347
Dropped compile-fix patch (upstreamed)
This commit is contained in:
Jaroslav Škarvada 2019-05-27 21:36:27 +02:00
parent b8d3799e64
commit 4a42330750
3 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rrdtool-1.7.1-compile-fix.patch
View File

@ -1,29 +0,0 @@
diff --git a/etc/Makefile.am b/etc/Makefile.am
index ab763dc..7d18178 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
if HAVE_SYSTEMD
systemdsystemunit_DATA = \
- etc/rrdcached.socket \
- etc/rrdcached.service
+ rrdcached.socket \
+ rrdcached.service
endif
\ No newline at end of file
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 74b914b..d512fd5 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
rrdcached.socket.in rrdcached.service.in
@HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \
-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service
+@HAVE_SYSTEMD_TRUE@ rrdcached.socket \
+@HAVE_SYSTEMD_TRUE@ rrdcached.service
all: all-am

10
rrdtool.spec
View File

@ -23,7 +23,7 @@
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
Version: 1.7.1
Version: 1.7.2
Release: 1%{?dist}
License: GPLv2+ with exceptions
URL: http://oss.oetiker.ch/rrdtool/
@ -35,8 +35,6 @@ Patch2: rrdtool-1.4.7-php55.patch
Patch3: rrdtool-1.6.0-ruby-2-fix.patch
# enable php bindings on ppc
Patch4: rrdtool-1.4.8-php-ppc-fix.patch
# https://github.com/oetiker/rrdtool-1.x/pull/960
Patch5: rrdtool-1.7.1-compile-fix.patch
Requires: dejavu-sans-mono-fonts
Requires(post): systemd
@ -195,7 +193,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
%patch3 -p1 -b .ruby-2-fix
%endif
%patch4 -p1 -b .php-ppc-fix
%patch5 -p1 -b .compile-fix
# Fix to find correct python dir on lib64
perl -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
@ -455,6 +452,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
%endif
%changelog
* Mon May 27 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.2-1
- New version
Resolves: rhbz#1714347
- Dropped compile-fix patch (upstreamed)
* Tue Feb 5 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 1.7.1-1
- New version
Resolves: rhbz#1672309

3
sources
View File

@ -1,2 +1 @@
SHA512 (rrdtool-1.7.1.tar.gz) = ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
SHA512 (php4-r1190.tar.gz) = 5fe8f3798abe50553a825ca8358c0d44af389ce5e5ae219c26da70e39f982fce95ad49ef620d03dd4a4a575e7a75d2f569c2013a250f2bcd16c3b2a5322a8eb7
SHA512 (rrdtool-1.7.2.tar.gz) = 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29