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

- remove python_* macros clashing with the built-in ones

Browse Source 
- fix for new vendorlib directory
This commit is contained in:
Štěpán Kasal 2010-01-13 11:45:19 +00:00
parent 9ca4a7b9ea
commit 57c2e2b8e1
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rrdtool.spec
View File

@ -65,15 +65,15 @@ Provides: perl-%{name} = %{version}-%{release}
The Perl RRDtool bindings The Perl RRDtool bindings
%if %{with_python} %if %{with_python}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')} # Make sure the runtime python is newer than the build one;
# eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot # give a default value to handle parsing in cases when python is not present:
%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")} %{!?rrd_python_version: %define rrd_python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "3.14")}
%package python %package python
Summary: Python RRDtool bindings Summary: Python RRDtool bindings
Group: Development/Languages Group: Development/Languages
BuildRequires: python-devel >= 2.3 BuildRequires: python-devel
Requires: python >= %{python_version} Requires: python >= %{rrd_python_version}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Obsoletes: python-%{name} < %{version}-%{release} Obsoletes: python-%{name} < %{version}-%{release}
Provides: python-%{name} = %{version}-%{release} Provides: python-%{name} = %{version}-%{release}
@ -231,10 +231,10 @@ __EOF__
%endif %endif
# Pesky RRDp.pm... # Pesky RRDp.pm...
%{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/ %{__mv} $RPM_BUILD_ROOT%{perl_vendorlib}/RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
# Dunno why this is getting installed here... # Dunno why this is getting installed here...
%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/../leaktest.pl %{__rm} -f $RPM_BUILD_ROOT%{perl_vendorlib}/leaktest.pl
# We only want .txt and .html files for the main documentation # We only want .txt and .html files for the main documentation
%{__mkdir_p} doc2/html doc2/txt %{__mkdir_p} doc2/html doc2/txt
@ -323,6 +323,10 @@ find examples/ -type f -exec chmod 0644 {} \;
%endif %endif
%changelog %changelog
* Wed Jan 13 2010 Stepan Kasal <skasal@redhat.com> - 1.3.8-6
- remove python_* macros clashing with the built-in ones
- fix for new vendorlib directory
* Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 1.3.8-5 * Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 1.3.8-5
- rebuild against perl 5.10.1 - rebuild against perl 5.10.1