Browse Source

rrdtool-1.7.2-4

Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
157492b996
1 changed files with 12 additions and 22 deletions
  1. 12 22
      r/rrdtool/rrdtool-vl.spec

+ 12 - 22
r/rrdtool/rrdtool-vl.spec

@@ -4,7 +4,7 @@ Name:		rrdtool
 Summary:	RRDtool - Round Robin Database tool
 Summary(ja):	RRDtool - ラウンドロビンデータベースツール
 Version:	1.7.2
-Release:	3%{?_dist_release}
+Release:	4%{?_dist_release}
 Group:		admin-tools,graphics
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -14,6 +14,7 @@ License:	GPLv2+ with exceptions
 URL:		http://oss.oetiker.ch/rrdtool/
 Source0:	http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
 Patch3:		rrdtool-1.6.0-ruby-2-fix.patch
+Patch5:		rrdtool-1.7.2-python-rpath-fix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 # Dependency
@@ -24,8 +25,6 @@ BuildRequires:	libxml2-devel
 BuildRequires:	lua-devel
 BuildRequires:	pango-devel
 BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	python-devel
-BuildRequires:	python-setuptools
 BuildRequires:	ruby-devel
 BuildRequires:	tcl-devel
 
@@ -83,17 +82,6 @@ Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi
 The Perl RRDTool bindings.
 
 
-%package -n python-rrdtool
-Summary:	Python RRDTool bindings
-Summary(ja):	RRDTool の Python バインディング
-Group:		programming
-Requires:	%{name} = %{version}-%{release}
-Requires:	python(abi) = %{python_version}
-
-%description -n python-rrdtool
-RDTool bindings for python.
-
-
 %package -n python3-rrdtool
 Summary:	Python3 RRDTool bindings
 Summary(ja):	RRDTool の Python3 バインディング
@@ -118,13 +106,18 @@ Requires:	%{name} = %{version}-%{release}
 RRDtool bindings for Ruby.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch3 -p1 -b .ruby-2-fix
-autoreconf -vif
+%patch5 -p1 -b .python-rpath-fix
+./bootstrap
 
 
 %build
+export PYTHON=%{__python3}
 %configure \
     --disable-rpath \
     --disable-static \
@@ -232,13 +225,6 @@ chmod -x ${RPM_BUILD_ROOT}%{_datadir}/rrdtool/examples/*.py
 %{_datadir}/rrdtool/examples/rrdcached/rrdcached-size.pl
 %{_mandir}/man3/RRD?.3pm*
 
-%files -n python-rrdtool
-%defattr(-,root,root)
-%license bindings/python/COPYING
-%doc bindings/python/README*
-%{python_sitearch}/rrdtool-*-py*.egg-info
-%{python_sitearch}/rrdtool.so
-
 %files -n python3-rrdtool
 %defattr(-,root,root)
 %license bindings/python/COPYING
@@ -254,6 +240,10 @@ chmod -x ${RPM_BUILD_ROOT}%{_datadir}/rrdtool/examples/*.py
 
 
 %changelog
+* Mon Nov 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.2-4
+- rebuilt with ruby-3.0.2.
+- dropped python2 support.
+
 * Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.2-3
 - fixed dependency.