rpms/spr/devel SPR-3.3.2-stdio.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 spr.spec, 1.9, 1.10 spr-07.08.00-cflags.patch, 1.1, NONE

[Michael Thomas]

Author: wart

Update of /cvs/pkgs/rpms/spr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20846

Modified Files:
	.cvsignore sources spr.spec 
Added Files:
	SPR-3.3.2-stdio.patch 
Removed Files:
	spr-07.08.00-cflags.patch 
Log Message:
Update to latest release



SPR-3.3.2-stdio.patch:

--- NEW FILE SPR-3.3.2-stdio.patch ---
--- SPR-3.3.2/src/SprAddColumnsForMCLApp.cc.orig	2009-07-13 16:50:41.000000000 -0700
+++ SPR-3.3.2/src/SprAddColumnsForMCLApp.cc	2009-07-13 16:50:47.000000000 -0700
@@ -4,6 +4,7 @@
 #include "StatPatternRecognition/SprMultiClassReader.hh"
 #include "StatPatternRecognition/SprTrainedMultiClassLearner.hh"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <iostream>
--- SPR-3.3.2/src/SprIndicatorMatrixApp.cc.orig	2009-07-13 17:07:12.000000000 -0700
+++ SPR-3.3.2/src/SprIndicatorMatrixApp.cc	2009-07-13 17:07:20.000000000 -0700
@@ -4,6 +4,7 @@
 #include "StatPatternRecognition/SprIndicatorMatrix.hh"
 #include "StatPatternRecognition/SprConfig.hh"
 
+#include <stdio.h>
 #include <iostream>
 #include <string>
 #include <unistd.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spr/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	18 Mar 2008 17:29:15 -0000	1.7
+++ .cvsignore	14 Jul 2009 04:08:42 -0000	1.8
@@ -1 +1 @@
-SPR-07-15-00.tar.gz
+SPR-3.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	18 Mar 2008 17:29:15 -0000	1.7
+++ sources	14 Jul 2009 04:08:42 -0000	1.8
@@ -1 +1 @@
-43ac6925212235f506287b5601634b42  SPR-07-15-00.tar.gz
+79afa6a1a42ec1d169f5bcba0acedfe7  SPR-3.3.2.tar.gz


Index: spr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spr/devel/spr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- spr.spec	28 Feb 2009 13:17:59 -0000	1.9
+++ spr.spec	14 Jul 2009 04:08:42 -0000	1.10
@@ -1,14 +1,14 @@
 Name:           spr
-Version:        07.15.00
-Release:        3%{?dist}
+Version:        3.3.2
+Release:        1%{?dist}
 Summary:        Library for categorization of data
 
 Group:          Development/Libraries
 License:        GPL+
 URL:            http://www.hep.caltech.edu/~narsky/spr.html
-Patch0:         spr-07.08.00-cflags.patch
-Patch1:         spr-07.08.00-getopt_ret.patch
-Source0:        http://downloads.sourceforge.net/statpatrec/SPR-07-15-00.tar.gz
+Patch0:         spr-07.08.00-getopt_ret.patch
+Patch1:         SPR-3.3.2-stdio.patch
+Source0:        http://downloads.sourceforge.net/statpatrec/SPR-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libstdc++-devel
 
@@ -25,16 +25,17 @@ Requires: %{name} = %{version}-%{release
 %{summary}.
 
 %prep
-%setup -q -n StatPatternRecognition
-touch -r configure.ac configure.ac.stamp
+%setup -q -n SPR-%{version}
 %patch0 -p1
 %patch1 -p1
-touch -r configure.ac.stamp configure.ac
 
 
 %build
-%configure --without-root --disable-static --datadir=%{_datadir}/%{name} \
-            --includedir=%{_includedir}/%{name}
+%configure --without-root --disable-static --disable-rpath \
+        --datadir=%{_datadir}/%{name} --includedir=%{_includedir}/%{name}
+# Get rid of rpath turds
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 # Remove this gcc34-ism.  Upstream is aware of this and needs time to
 # find a fix.
@@ -42,7 +43,7 @@ sed -i -e 's/ -lg2c//' src/Makefile
 
 # Parallel builds currently not supported.  Upstream is aware of this
 # and needs time to find a fix.
-make
+make %{?smp_mflags}
 
 
 %install
@@ -62,20 +63,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING HISTORY README
+%doc AUTHORS COPYING TODO README ChangeLog
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_datadir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING HISTORY README src/example*.cc
+%doc AUTHORS COPYING TODO README ChangeLog src/example*.cc
 %{_includedir}/%{name}
 %{_libdir}/*.so
 
 
 
 %changelog
+* Mon Jul 13 2009 Wart <wart at kobold.org> - 3.3.2-1
+- Update to latest release
+
 * Sat Feb 28 2009 Caolán McNamara <caolanm at redhat.com> - 07.15.00-3
 - comparing getopt ret to EOF requires stdio.h, or use just -1 (man 3p getopt)
 


--- spr-07.08.00-cflags.patch DELETED ---