New version
Resolves: rhbz#1214750 - Dropped python-fix (upstreamed)
This commit is contained in:
parent
947b598027
commit
e678e02160
@ -1,15 +0,0 @@
|
|||||||
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
|
|
||||||
index bdfee3b..6d34847 100644
|
|
||||||
--- a/bindings/Makefile.am
|
|
||||||
+++ b/bindings/Makefile.am
|
|
||||||
@@ -38,8 +38,8 @@ install-data-local:
|
|
||||||
&& ( cd ${builddir}/python \
|
|
||||||
&& env BUILDLIBDIR=${abs_top_builddir}/src/.libs \
|
|
||||||
$(PYTHON) ${abs_srcdir}/python/setup.py install \
|
|
||||||
- --skip-build --prefix=$(DESTDIR)$(prefix) \
|
|
||||||
- --exec-prefix=$(DESTDIR)$(exec_prefix) ) \
|
|
||||||
+ --skip-build --root=$(DESTDIR) --prefix=$(prefix) \
|
|
||||||
+ --exec-prefix=$(exec_prefix)) \
|
|
||||||
|| true
|
|
||||||
|
|
||||||
# rules for building the ruby module
|
|
@ -29,12 +29,3 @@ index 6d277bf..d0d9ea0 100644
|
|||||||
[AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
|
[AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
|
||||||
[lua_havelib=LUA$lua_vndot],
|
[lua_havelib=LUA$lua_vndot],
|
||||||
[AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
|
[AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,
|
||||||
@@ -853,7 +853,7 @@ LUA_EOF
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
- LUA_RRD_LIBDIR="$langpref/lib/lua/$lua_vdot"
|
|
||||||
+ LUA_RRD_LIBDIR="$libdir/lua/$lua_vdot"
|
|
||||||
# if lua 5.0 can't find compat-5.1, force installation of
|
|
||||||
# compat-5.1.lua together with RRDtool.
|
|
||||||
if test "$lua_vdot" = "5.0" -a "$LUA_HAVE_COMPAT51" != "HAVE_COMPAT51"; then
|
|
17
rrdtool.spec
17
rrdtool.spec
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
Summary: Round Robin Database Tool to store and display time-series data
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.5.0
|
Version: 1.5.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+ with exceptions
|
License: GPLv2+ with exceptions
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
@ -27,11 +27,9 @@ Patch1: rrdtool-1.4.4-php54.patch
|
|||||||
# disable logo for php 5.5.
|
# disable logo for php 5.5.
|
||||||
Patch2: rrdtool-1.4.7-php55.patch
|
Patch2: rrdtool-1.4.7-php55.patch
|
||||||
Patch3: rrdtool-1.5.0-ruby-2-fix.patch
|
Patch3: rrdtool-1.5.0-ruby-2-fix.patch
|
||||||
Patch4: rrdtool-1.5.0-lua-5.2.patch
|
Patch4: rrdtool-1.5.1-lua-5.2.patch
|
||||||
# enable php bindings on ppc
|
# enable php bindings on ppc
|
||||||
Patch5: rrdtool-1.4.8-php-ppc-fix.patch
|
Patch5: rrdtool-1.4.8-php-ppc-fix.patch
|
||||||
# sent upstream
|
|
||||||
Patch6: rrdtool-1.5.0-python-fix.patch
|
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Requires: dejavu-sans-mono-fonts
|
Requires: dejavu-sans-mono-fonts
|
||||||
@ -177,7 +175,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
|
|||||||
%endif
|
%endif
|
||||||
%patch4 -p1 -b .lua-52
|
%patch4 -p1 -b .lua-52
|
||||||
%patch5 -p1 -b .php-ppc-fix
|
%patch5 -p1 -b .php-ppc-fix
|
||||||
%patch6 -p1 -b .python-fix
|
|
||||||
|
|
||||||
# Fix to find correct python dir on lib64
|
# 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' \
|
%{__perl} -pi -e 's|get_python_lib\(0,0,prefix|get_python_lib\(1,0,prefix|g' \
|
||||||
@ -197,9 +194,6 @@ The %{name}-lua package includes RRDtool bindings for Lua.
|
|||||||
# workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
|
# workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
|
||||||
cp -p /usr/lib/rpm/config.{guess,sub} php4/
|
cp -p /usr/lib/rpm/config.{guess,sub} php4/
|
||||||
|
|
||||||
# Add missing VERSION (reported upstream)
|
|
||||||
echo %{version} > VERSION
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./bootstrap
|
./bootstrap
|
||||||
%configure \
|
%configure \
|
||||||
@ -333,7 +327,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc CONTRIBUTORS COPYRIGHT TODO NEWS CHANGES THREADS
|
%doc LICENSE CONTRIBUTORS COPYRIGHT TODO NEWS CHANGES THREADS
|
||||||
%exclude %{_docdir}/examples
|
%exclude %{_docdir}/examples
|
||||||
%exclude %{_docdir}/doc2/html
|
%exclude %{_docdir}/doc2/html
|
||||||
%exclude %{_docdir}/doc2/txt
|
%exclude %{_docdir}/doc2/txt
|
||||||
@ -403,6 +397,11 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 23 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1.5.1-1
|
||||||
|
- New version
|
||||||
|
Resolves: rhbz#1214750
|
||||||
|
- Dropped python-fix (upstreamed)
|
||||||
|
|
||||||
* Mon Apr 20 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1.5.0-1
|
* Mon Apr 20 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1.5.0-1
|
||||||
- New version
|
- New version
|
||||||
Resolves: rhbz#1213035
|
Resolves: rhbz#1213035
|
||||||
|
Loading…
Reference in New Issue
Block a user