rpms/spr/EL-4 SPR-3.3.2-stdio.patch, NONE, 1.1 spr-07.08.00-getopt_ret.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 spr.spec, 1.2, 1.3 spr-07.08.00-cflags.patch, 1.1, NONE
Michael Thomas
wart at fedoraproject.org
Tue Jul 14 07:09:04 UTC 2009
Author: wart
Update of /cvs/pkgs/rpms/spr/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3595
Modified Files:
.cvsignore sources spr.spec
Added Files:
SPR-3.3.2-stdio.patch spr-07.08.00-getopt_ret.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>
spr-07.08.00-getopt_ret.patch:
--- NEW FILE spr-07.08.00-getopt_ret.patch ---
--- StatPatternRecognition.orig/src/SprAddBaggersApp.cc 2009-02-28 12:59:54.000000000 +0000
+++ StatPatternRecognition/src/SprAddBaggersApp.cc 2009-02-28 13:00:00.000000000 +0000
@@ -44,7 +44,7 @@
int c;
extern char* optarg;
// extern int optind;
- while((c = getopt(argc,argv,"hv:")) != EOF ) {
+ while((c = getopt(argc,argv,"hv:")) != -1 ) {
switch( c )
{
case 'h' :
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spr/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 19 Feb 2008 01:25:42 -0000 1.3
+++ .cvsignore 14 Jul 2009 07:08:53 -0000 1.4
@@ -1 +1 @@
-SPR-07-12-01.tar.gz
+SPR-3.3.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spr/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 19 Feb 2008 01:25:42 -0000 1.3
+++ sources 14 Jul 2009 07:08:57 -0000 1.4
@@ -1 +1 @@
-6469254004c8f619cc281211c6544a04 SPR-07-12-01.tar.gz
+79afa6a1a42ec1d169f5bcba0acedfe7 SPR-3.3.2.tar.gz
Index: spr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spr/EL-4/spr.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- spr.spec 19 Feb 2008 01:25:42 -0000 1.2
+++ spr.spec 14 Jul 2009 07:08:59 -0000 1.3
@@ -1,13 +1,14 @@
Name: spr
-Version: 07.12.01
+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
-Source0: http://downloads.sourceforge.net/statpatrec/SPR-07-12-01.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
@@ -24,15 +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
-touch -r configure.ac.stamp configure.ac
+%patch1 -p1
%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.
@@ -60,22 +63,48 @@ 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 TODO README ChangeLog src/example*.cc
%{_includedir}/%{name}
%{_libdir}/*.so
%changelog
-* Mon Feb 18 2008 Wart <wart at kobold.org> 07.12.01-1
+* Mon Jul 13 2009 Wart <wart at kobold.org> - 3.3.2-1
+- Update to latest release; rebase to Fedora version
+
+* 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)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 07.15.00-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Mar 17 2008 Wart <wart at kobold.org> 07.15.00-1
+- Upgrade to 07.15.00
+- Add example program sources to -devel documentation
+
+* Thu Feb 14 2008 Wart <wart at kobold.org> 07.12.01-1
- Upgrade to 07.12.01
+* Sun Feb 10 2008 Wart <wart at kobold.org> 07.08.00-1
+- Upgrade to 07.08.00
+- Add patch for building with gcc 4.3
+
+* Tue Aug 21 2007 Wart <wart at kobold.org> 07.00.00-1
+- Update to latest release
+- License tag clarification
+
+* Tue May 15 2007 Wart <wart at kobold.org> 05.02.00-1
+- Update to 05.02.00
+- Remove patch that was accepted upstream
+
* Mon Apr 23 2007 Michael Thomas <thomas at hep.caltech.edu> 05.01.00-3
- Fix ownership of header directory in -devel subpackage
--- spr-07.08.00-cflags.patch DELETED ---
More information about the fedora-extras-commits
mailing list