rpms/orsa/F-9 import.log, NONE, 1.1 orsa-configure.patch, NONE, 1.1 orsa-gcc43.patch, NONE, 1.1 orsa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Miloš Jakubíček
mjakubicek at fedoraproject.org
Mon Sep 15 08:36:41 UTC 2008
- Previous message (by thread): rpms/orsa/devel import.log, NONE, 1.1 orsa-configure.patch, NONE, 1.1 orsa-gcc43.patch, NONE, 1.1 orsa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/hunspell/devel hunspell.spec,1.50,1.51
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mjakubicek
Update of /cvs/pkgs/rpms/orsa/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12261/F-9
Modified Files:
.cvsignore sources
Added Files:
import.log orsa-configure.patch orsa-gcc43.patch orsa.spec
Log Message:
- Initial release.
--- NEW FILE import.log ---
orsa-0_7_0-2_fc9:F-9:orsa-0.7.0-2.fc9.src.rpm:1221467642
orsa-configure.patch:
--- NEW FILE orsa-configure.patch ---
--- orsa-0.7.0/configure.orig 2005-01-11 22:35:31.000000000 +0100
+++ orsa-0.7.0/configure 2008-09-07 17:06:37.000000000 +0200
@@ -20362,9 +20362,9 @@
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
cln_min_micro_version=`echo $cln_min_version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
- CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cppflags`
+ CLN_CPPFLAGS=`$CLN_CONFIG $cln_config_args --cflags`
CLN_LIBS=`$CLN_CONFIG $cln_config_args --libs`
- cln_config_version=`$CLN_CONFIG $cln_config_args --version`
+ cln_config_version=`$CLN_CONFIG $cln_config_args --modversion`
cln_config_major_version=`echo $cln_config_version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
cln_config_minor_version=`echo $cln_config_version | \
@@ -20637,9 +20637,9 @@
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
ginac_min_micro_version=`echo $ginac_min_version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
- GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cppflags`
+ GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cflags`
GINACLIB_LIBS=`$GINACLIB_CONFIG $ginac_args --libs`
- ginac_config_version=`$GINACLIB_CONFIG $ginac_args --version`
+ ginac_config_version=`$GINACLIB_CONFIG $ginac_args --modversion`
ginac_config_major_version=`echo $ginac_config_version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
ginac_config_minor_version=`echo $ginac_config_version | \
@@ -27012,7 +27012,7 @@
echo "${ECHO_T}$ac_cv_have_fftw" >&6
if test "$ac_cv_have_fftw" != "no"; then
ac_save_LIBS="$LIBS"
- LIBS="-lfftw $ac_save_LIBS"
+ LIBS="-lfftw -lm $ac_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -27021,7 +27021,7 @@
/* end confdefs.h. */
#include <fftw.h>
-
+ #include <math.h>
int
main ()
{
orsa-gcc43.patch:
--- NEW FILE orsa-gcc43.patch ---
--- orsa-0.7.0/src/liborsa/orsa_coord.cc.orig 2004-09-21 21:44:20.000000000 +0200
+++ orsa-0.7.0/src/liborsa/orsa_coord.cc 2008-09-05 12:42:25.000000000 +0200
@@ -26,6 +26,7 @@
#include <cmath>
#include <iostream>
+#include <cstdlib>
using namespace std;
--- orsa-0.7.0/src/liborsa/orsa_interaction.cc.orig 2005-01-04 23:31:25.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_interaction.cc 2008-09-05 12:48:19.000000000 +0200
@@ -29,6 +29,7 @@
#include <cmath>
#include <iostream>
+#include <cstdlib>
using namespace std;
--- orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc.orig 2004-10-02 02:04:30.000000000 +0200
+++ orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc 2008-09-05 13:06:00.000000000 +0200
@@ -30,6 +30,7 @@
#include <list>
#include <stack>
#include <map>
+#include <cstring>
using namespace std;
--- orsa-0.7.0/src/liborsa/orsa_units.h.orig 2005-01-05 04:54:27.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_units.h 2008-09-05 18:26:01.000000000 +0200
@@ -25,6 +25,7 @@
#ifndef _ORSA_UNITS_H
#define _ORSA_UNITS_H
+#include <cstdlib>
#include <cmath>
#include <string>
#include <cstdio>
--- orsa-0.7.0/src/liborsa/orsa_body.h.orig 2004-12-30 04:58:03.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_body.h 2008-09-05 18:30:26.000000000 +0200
@@ -183,7 +183,7 @@
inline void SetVelocity(const double x, const double y, const double z) { Vector v(x,y,z); SetVelocity(v); }
// b position - this position
- inline Vector Body::distanceVector(const Body & b) const { return b.position()-position(); }
+ inline Vector distanceVector(const Body & b) const { return b.position()-position(); }
inline double distance(const Body & b) const { return distanceVector(b).Length(); }
// alias
--- orsa-0.7.0/src/liborsa/orsa_file_jpl.cc.orig 2005-01-05 03:25:06.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_file_jpl.cc 2008-09-05 18:33:41.000000000 +0200
@@ -22,6 +22,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <cstring>
#include "orsa_file.h"
#include "orsa_error.h"
#include "orsa_secure_math.h"
--- orsa-0.7.0/src/liborsa/orsa_file.cc.orig 2005-01-11 02:01:11.000000000 +0100
+++ orsa-0.7.0/src/liborsa/orsa_file.cc 2008-09-05 18:43:03.000000000 +0200
@@ -52,6 +52,9 @@
#include "config.h"
#endif // HAVE_CONFIG_H
+#include <cstring>
+#include <algorithm>
+
using namespace std;
namespace orsa {
--- orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h.orig 2005-01-05 04:04:17.000000000 +0100
+++ orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h 2008-09-05 18:49:29.000000000 +0200
@@ -600,7 +600,7 @@
inline XOrsaAstorbObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null) : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { };
public:
- inline int XOrsaAstorbObjectItem::compare(QListViewItem *i, int col, bool ascending) const {
+ inline int compare(QListViewItem *i, int col, bool ascending) const {
using std::atof;
--- orsa-0.7.0/src/libxorsa/xorsa_plot_area.h.orig 2005-01-05 03:25:06.000000000 +0100
+++ orsa-0.7.0/src/libxorsa/xorsa_plot_area.h 2008-09-05 18:58:44.000000000 +0200
@@ -57,7 +57,13 @@
}
}
+#ifdef __cplusplus
+extern "C" {
+#endif
extern char *MonthNameShort[13]; // sdncal.h
+#ifdef __cplusplus
+}
+#endif // __cplusplus
void FineDate(QString & label, const orsa::UniverseTypeAwareTime & t, bool=true);
void FineDate_HMS(QString & label, const orsa::UniverseTypeAwareTime & t);
--- orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc.orig 2004-06-25 05:12:57.000000000 +0200
+++ orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc 2008-09-05 19:01:33.000000000 +0200
@@ -40,7 +40,7 @@
XOrsaObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
public:
- int XOrsaObjectItem::compare(QListViewItem * i, int col, bool ascending) const;
+ int compare(QListViewItem * i, int col, bool ascending) const;
};
--- orsa-0.7.0/src/orsa/xorsa.h.orig 2004-07-13 04:21:19.000000000 +0200
+++ orsa-0.7.0/src/orsa/xorsa.h 2008-09-05 19:10:14.000000000 +0200
@@ -62,7 +62,7 @@
ObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
public:
- int ObjectItem::compare(QListViewItem * i, int col, bool ascending) const;
+ int compare(QListViewItem * i, int col, bool ascending) const;
};
--- orsa-0.7.0/src/libxorsa/xorsa_analysis.h.orig 2004-06-25 02:58:30.000000000 +0200
+++ orsa-0.7.0/src/libxorsa/xorsa_analysis.h 2008-09-07 17:26:55.000000000 +0200
@@ -129,7 +129,7 @@
XOrsaPeaksListItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
public:
- int XOrsaPeaksListItem::compare(QListViewItem * i, int col, bool ascending) const;
+ int compare(QListViewItem * i, int col, bool ascending) const;
};
--- NEW FILE orsa.spec ---
Name: orsa
Version: 0.7.0
Release: 2%{?dist}
Summary: Orbit Reconstruction, Simulation and Analysis
Group: Amusements/Graphics
License: GPLv2+
URL: http://orsa.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Patch to build with GCC 4.3
# Reported into upstream bugtracker as
# http://sourceforge.net/tracker/index.php?func=detail&aid=2099077&group_id=44502&atid=439768
Patch0: %{name}-gcc43.patch
# Patching configure in order to:
# - make it find the fftw2 library properly (-lm was missing but needed)
# - make it find the cln and ginac libraries properly as they do not use
# {cln,ginac}-config anymore but rely on pkg-config instead in F9 and higher
# Reported into upstream bugtracker as
# http://sourceforge.net/tracker/index.php?func=detail&aid=2099054&group_id=44502&atid=439768
Patch1: %{name}-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel
BuildRequires: qt3-devel
BuildRequires: mesa-libGL-devel
BuildRequires: fftw2-devel
BuildRequires: gsl-devel
BuildRequires: cln-devel
BuildRequires: ginac-devel
BuildRequires: openmpi-devel
%description
ORSA is an interactive tool for scientific grade Celestial Mechanics
computations. Asteroids, comets, artificial satellites, Solar and extra-Solar
planetary systems can be accurately reproduced, simulated, and analyzed.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: fftw2-devel
Requires: gsl-devel
Requires: zlib-devel
Requires: %{name} = %{version}-%{release}
%description devel
This package contains development files for %{name}.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
# honor $RPM_OPT_FLAGS
sed -i 's|-g -Wall -W -pipe -ftemplate-depth-64 -O3 -fno-exceptions -funroll-loops -fstrict-aliasing -fno-gcse|$CXXFLAGS|' configure
%configure --disable-static --with-mpi "CLN_CONFIG=`which pkg-config` cln" "GINACLIB_CONFIG=`which pkg-config` ginac"
# remove rpaths
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
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# we don't want to ship libtool archives:
rm $RPM_BUILD_ROOT%{_libdir}/liborsa.la $RPM_BUILD_ROOT%{_libdir}/libxorsa.la
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING DEVELOPERS
%{_bindir}/xorsa
%{_libdir}/liborsa.so.*
%{_libdir}/libxorsa.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/liborsa.so
%{_libdir}/libxorsa.so
%changelog
* Wed Sep 10 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-2
- Patched configure to honor $RPM_OPT_FLAGS
- Added missing Requires: to the -devel subpackage
* Fri Sep 5 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 0.7.0-1
- Initial release.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 14 Sep 2008 22:26:11 -0000 1.1
+++ .cvsignore 15 Sep 2008 08:36:10 -0000 1.2
@@ -0,0 +1 @@
+orsa-0.7.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/orsa/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 14 Sep 2008 22:26:12 -0000 1.1
+++ sources 15 Sep 2008 08:36:11 -0000 1.2
@@ -0,0 +1 @@
+16c86f3aa73920631f9768d8c70cce70 orsa-0.7.0.tar.gz
- Previous message (by thread): rpms/orsa/devel import.log, NONE, 1.1 orsa-configure.patch, NONE, 1.1 orsa-gcc43.patch, NONE, 1.1 orsa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/hunspell/devel hunspell.spec,1.50,1.51
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list