SPECS: rrdtool.spec - python 2.4 compatible build

glen glen at pld-linux.org
Sun Oct 5 13:30:59 CEST 2008 

Author: glen                         Date: Sun Oct  5 11:30:59 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- python 2.4 compatible build

---- Files affected:
SPECS:
   rrdtool.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: SPECS/rrdtool.spec
diff -u SPECS/rrdtool.spec:1.128 SPECS/rrdtool.spec:1.129
--- SPECS/rrdtool.spec:1.128	Sun Apr 13 14:58:30 2008
+++ SPECS/rrdtool.spec	Sun Oct  5 13:30:53 2008
@@ -12,13 +12,14 @@
 Summary(uk.UTF-8):	RRDtool - це система зберігання та показу серійних даних
 Name:		rrdtool
 Version:	1.2.27
-Release:	1
+Release:	2
 License:	GPL v2+ + FLOSS exception
 Group:		Applications/Databases
 Source0:	http://oss.oetiker.ch/rrdtool/pub/%{name}-%{version}.tar.gz
 # Source0-md5:	841ca303c88f7184cf0aaab07e52dec4
 Patch0:		%{name}-tcl-path.patch
-URL:		http://oss.oetiker.ch/rrdtool/	
+Patch1:		%{name}-spelling.patch
+URL:		http://oss.oetiker.ch/rrdtool/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	freetype-devel >= 2.1.7
@@ -28,8 +29,8 @@
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	pkgconfig
 %if %{with python}
-BuildRequires:	python >= 1:2.5
-BuildRequires:	python-devel >= 1:2.5
+BuildRequires:	python
+BuildRequires:	python-devel
 %endif
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
@@ -204,6 +205,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -283,8 +285,10 @@
 %files -n python-rrdtool
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/rrdtoolmodule.so
+%if "%{py_ver}" > "2.4"
 %{py_sitedir}/py_rrdtool-*.egg-info
 %endif
+%endif
 
 %files -n tcl-rrdtool
 %defattr(644,root,root,755)
@@ -297,6 +301,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2008/10/05 11:30:53  glen
+- python 2.4 compatible build
+
 Revision 1.128  2008/04/13 12:58:30  qboosh
 - libtoolize (fixes build with libtool 2.2)
 - ghost soname symlinks
@@ -453,10 +460,10 @@
 - update
 
 Revision 1.79  2004/05/10 19:00:32  adasi
- - still NFY, but building at least
+- still NFY, but building at least
 
 Revision 1.78  2004/05/10 18:13:33  adasi
- - just for test, NFY yet
+- just for test, NFY yet
 
 Revision 1.77  2004/04/22 13:14:06  cieciwa
 - version 1.0.48,
@@ -474,7 +481,7 @@
 - merged fron RA-branch: ru, name fixes
 
 Revision 1.73  2004/02/02 20:43:47  grzegol
-- added perl_sitearch=%%{perl_vendorarch} to make install
+- added perl_sitearch=%{perl_vendorarch} to make install
 
 Revision 1.72  2004/01/30 15:33:27  orzech
 - patches are back
@@ -513,7 +520,7 @@
 
 Revision 1.61  2003/07/30 22:24:57  grzegol
 - updated to 1.0.45
-- added %%doc
+- added %doc
 
 Revision 1.60  2003/07/28 20:27:56  blues
 - kill subshells, kill-kill-kill
@@ -545,10 +552,9 @@
 - fixed autoheader call
 
 Revision 1.51  2003/03/18 09:13:51  cieciwa
- - version 1.0.41,
- - release 1,
-
- NFY
+- version 1.0.41,
+- release 1,
+  NFY
 
 Revision 1.50  2003/03/14 19:31:18  wiget
 - run autoheader too
@@ -582,9 +588,9 @@
 - added mising header file and manual pages from section 3
 
 Revision 1.41  2002/05/21 23:14:39  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.40  2002/05/02 19:50:39  kloczek
 - updated to 1.0.37.
@@ -609,12 +615,12 @@
   Group field using gettext).
 
 Revision 1.33  2002/01/18 02:14:49  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.32  2001/12/12 16:57:51  blues
 - release 6
 - pl translation added
-STBR
+  STBR
 
 Revision 1.31  2001/10/05 10:05:10  kloczek
 - merge translations stolen from CNV.
@@ -640,7 +646,7 @@
 - rebuild with perl 5.6.1
 
 Revision 1.24  2001/04/14 18:00:11  baggins
-- removed explicit requirements for perl = %%{version} and %%{perl_sitearch}
+- removed explicit requirements for perl = %{version} and %{perl_sitearch}
   they will be added by rpm if needed
 
 Revision 1.23  2001/04/13 22:02:23  baggins
@@ -650,7 +656,7 @@
 Revision 1.22  2001/04/12 14:41:10  baggins
 - release 2
 - added perl-install patch
-- install perl stuff in %%{perl_sitearch}
+- install perl stuff in %{perl_sitearch}
 
 Revision 1.21  2001/03/29 07:50:29  mis
 - autoupdated to 1.0.33
@@ -660,22 +666,22 @@
 
 Revision 1.19  2001/02/21 19:09:26  kloczek
 - added automake, autoconf to BuildRequires,
-- added using %%{_examplesdir} macro in %install.
+- added using %{_examplesdir} macro in %install.
 
 Revision 1.18  2001/02/21 18:54:37  wiget
-updated to 1.0.32
+- updated to 1.0.32
 
 Revision 1.17  2000/12/01 15:04:22  cieciwa
-- added %%Requires: perl >= 5.005
+- added %Requires: perl >= 5.005
 
 Revision 1.16  2000/10/25 00:04:23  kloczek
 - adapterized and some massive cosmetic changes :)
 
 Revision 1.15  2000/10/24 23:37:52  misiek
-include perl macros
+- include perl macros
 
 Revision 1.14  2000/10/24 22:32:37  misiek
-removed one of two clean sections
+- removed one of two clean sections
 
 Revision 1.13  2000/10/08 19:59:51  waszi
 - partially rewrited
@@ -706,10 +712,10 @@
 - fixed "Source0:" location.
 
 Revision 1.6  2000/06/09 07:55:10  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.5  2000/06/09 07:23:58  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.4  2000/04/01 11:15:40  zagrodzki
 - changed all BuildRoot definitons
@@ -723,90 +729,7 @@
 Revision 1.2  1999/11/04 11:46:26  wiget
 - some cleanups
 - updated to 1.0.7
-NFY
+  NFY
 
 Revision 1.1  1999/11/04 11:22:43  wiget
 - raw spec
-
-* Sat Aug 14 1999 Tobi
-- Released 1.0.6
-- Fixed install location of html pages ... they go to ../html now ...
-- Fixed CDEF parser ... it should now be fine with a,-1,*
-- Updated rrdgraph manpage to be in line with the changes I made to alexs INF patch when integrating it ... sorry alex
-
-* Fri Aug 13 1999 Tobi
-- Released 1.0.5
-- Tested portability of 1.0.5 release on Solaris, Linux and FreeBSD
-- changed IEEE tests ... now they tell you what fails and they are less picky
-
-* Thu Aug 12 1999 Alex + Tobi
-- added INF and NEGINF operator to CDEF rpn functions. This pushes an positive or negative infinite number onto the stack respectively ... when graphing, they get replaced by a value equivalent to the upper or lower boundery of the graphing area ...
-
-* Tue Aug 10 1999 Tobi
-- Integrated Blairs autoconf ... added dist and install support
-
-* Mon Aug 09 1999 Blair
-- Added automake/libtool support ... with --enable-shared you can now get a shared library version of rrdtool ...
-
-* Fri Aug 06 1999 Tobi
-- Released 1.0.4
-- made rrdcgi parser more robust to invalid inputfiles.
-
-* Wed Aug 04 1999 Tobi + Philippe
-- in rrd_cgi I was freeing cgi arguments. Fixed ...
-
-* Tue Aug 03 1999 Tobi
-- added % operator to CDEF rpn functions ...  this should allow for some funky operations in connection with TIME
-- added --enable-site-perl option to configure for people who want the RRD{s,p} perl modules installed in their site-perl directories
-- do not try to compile perl modules if no perl is found
-
-* Mon Aug 03 1999 Hermann Hueni <hueni at glue.ch>
-- drop "rb" open mode for non win32 architectures
-
-* Fri Jul 30 1999 Tobi
-- Released 1.0.3
-- Fixed default start time in rrd_create.
-- Start time of new rrds was set to 1970.01.01 causing VERY long update times for the initial update ...
-
-* Fri Jul 30 1999 Tobias Weingartner <weingart at cs.ualberta.ca>
-- spell fixes for documentation
-
-* Wed Jul 28 1999 Tobi
-- Released 1.0.2
-- Added configure checks for reallocs ability to deal with NULL pointers this helps compiling on SunOS
-- Added check for memmove availablility. Replace with bcopy if necessary.
-- Added better IEEE tests ...
-- Added Dynamic stack allocation to RPN in CDEF
-- fixed about 1000 memmory leaks in rrdcg. Wonder it was working before ...
-
-* Tue Jul 27 1999 Tobi & Tobias Weingartner <weingart at cs.ualberta.ca>
-- Added DUP, POP and EXC operator for CDEF.
-
-* Tue Jul 27 1999 Sasha Mikheev <sasha at aldan.netvision.net.il>
-- alternate grid and scaling functions for rrdgraph. Use --alt-y-grid and --alt-autoscale to activate.
-
-* Mon Jul 26 1999 Tamas Kovacshazy <khazy at mit.bme.hu>
-- improved vc++ project files for rrdtool
-
-* Mon Jul 26 1999 Tobi
-- added ranlib to cgi png z and gd library ...
-
-* Fri Jul 23 1999 Tobi
-- released 1.0.1
-- plugged memory leek in parsetime.c
-- fixed serious error in data_reduce function. This was causing the graph to intermittently disappear. It was also displaying inaccurate values for spiky data, if this data had to be reduced due to the width of the image as compared to the resolution of the RRA data.  (does this fix the errors seen by cricket users ????)
-
-* Thu Jul 22 1999 Seth Lepzelter <slepzelt at cs.oberlin.edu>
-- DEC needs -mieee to do proper IEEE math ... added configure test
-
-* Thu Jul 22 1999 Philippe.Simonet at swisscom.com
-- vc++ project files for rrdtool
-
-* Mon Jul 19 1999 Alex van den Bogaerdt <alex at ergens.op.Het.Net>
-- rrd file icon contributed
-
-* Mon Jul 19 1999 Tobi
-- added strcasecmp function into parsetime as this is not available on all systems.
-
-* Thu Jul 15 1999 Tobi
-- Released first 'stable' version of RRDtool after almost 18 Month of 'development'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rrdtool.spec?r1=1.128&r2=1.129&f=u

More information about the pld-cvs-commit mailing list