rpms/LabPlot/F-8 LabPlot-20080225.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 LabPlot.spec, 1.6, 1.7 sources, 1.3, 1.4
Chitlesh GOORAH
chitlesh at fedoraproject.org
Tue Nov 11 17:47:37 UTC 2008
- Previous message (by thread): rpms/kernel/F-10 linux-2.6-alsa-revo51-headphone.patch, NONE, 1.1 kernel.spec, 1.1132, 1.1133
- Next message (by thread): rpms/LabPlot/F-9 LabPlot-20080225.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 LabPlot.spec, 1.10, 1.11 sources, 1.3, 1.4 LabPlot-gcc43.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: chitlesh
Update of /cvs/pkgs/rpms/LabPlot/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14784/F-8
Modified Files:
.cvsignore LabPlot.spec sources
Added Files:
LabPlot-20080225.patch import.log
Log Message:
1.6.0.2
LabPlot-20080225.patch:
--- NEW FILE LabPlot-20080225.patch ---
diff --git a/src/ImportOPJ.cc b/src/ImportOPJ.cc
index 2b625d4..c49752f 100644
--- a/src/ImportOPJ.cc
+++ b/src/ImportOPJ.cc
@@ -12,6 +12,44 @@
#include <liborigin/OPJFile.h>
+// The declaration of liborigin's OPJFile::colType() changed from
+// const char *OPJFile::colType(int, int) const;
+// in version 20071119 to
+// ColumnType OPJFile::colType(int, int) const;
+// in version 20080225. This function can be used to get the string
+// that colType() returned in liborigin/20071119 from the ColumnType
+// that colType() returns in liborigin/20080225. The use of this
+// function requires a build-dependency on liborigin (>= 20080225).
+QString colTypeToString(const ColumnType type) {
+ QString type_str = "";
+
+ switch (type) {
+ case X:
+ type_str = "X";
+ break;
+ case Y:
+ type_str = "Y";
+ break;
+ case Z:
+ type_str = "Z";
+ break;
+ case XErr:
+ type_str = "DX";
+ break;
+ case YErr:
+ type_str = "DY";
+ break;
+ case Label:
+ type_str = "LABEL";
+ break;
+ case NONE:
+ type_str = "NONE";
+ break;
+ }
+
+ return type_str;
+}
+
ImportOPJ::ImportOPJ(MainWin *mw, QString filename)
: mw(mw),filename(filename)
{}
@@ -44,13 +82,13 @@ int ImportOPJ::import() {
for (int j=0;j<nr_cols;j++) {
QString name(opj.colName(s,j));
spread->setColumnTitle(j,name.replace(QRegExp(".*_"),""));
- spread->setColumnType(j,opj.colType(s,j));
+ spread->setColumnType(j,colTypeToString(opj.colType(s,j)));
for (int i=0;i<opj.numRows(s,j);i++) {
double *v = (double *) opj.oData(s,j,i,true);
LTableItem *item;
- if(strcmp(opj.colType(s,j),"LABEL")) { // number
+ if(strcmp(colTypeToString(opj.colType(s,j)),"LABEL")) { // number
if(fabs(*v)>0 && fabs(*v)<2.0e-300) // empty entry
continue;
item = new LTableItem( table, QTableItem::OnTyping,QString::number(*v));
@@ -62,7 +100,7 @@ int ImportOPJ::import() {
}
}
for (int s=0;s<opj.numMatrices();s++) {
- kdDebug()<<" Matrix "<<s+1<<" : "<<opj.matrixName(s)<<" (ParentFolder : "<<opj.matrixParentFolder(s)<<")"<<endl;
+ kdDebug()<<" Matrix "<<s+1<<" : "<<opj.matrixName(s)<<endl; //" (ParentFolder : "<<opj.matrixParentFolder(s)<<")"<<endl;
kdDebug()<<" Label : "<<opj.matrixLabel(s)<<" Cols/Rows : "<<opj.numMatrixCols(s)<<'/'<<opj.numMatrixRows(s)<<endl;
kdDebug()<<" Formula : "<<opj.matrixFormula(s)<<" DisplayType : "<<opj.matrixNumDisplayType(s)<<endl;
@@ -99,7 +137,7 @@ int ImportOPJ::import() {
QString notes = mw->getProject()->Notes();
for (int s=0;s<opj.numNotes();s++) {
- kdDebug()<<" Note "<<s+1<<" : "<<opj.noteName(s)<<" (ParentFolder : "<<opj.noteParentFolder(s)<<")"<<endl;
+ kdDebug()<<" Note "<<s+1<<" : "<<opj.noteName(s)<<endl; //" (ParentFolder : "<<opj.noteParentFolder(s)<<")"<<endl;
kdDebug()<<" Label : "<<opj.noteLabel(s)<<" Text : "<<opj.noteText(s)<<endl;
notes.append(QString(opj.noteLabel(s))+":\n");
notes.append(opj.noteText(s));
@@ -115,7 +153,7 @@ int ImportOPJ::import() {
}
for (int s=0;s<opj.numGraphs();s++) {
- kdDebug()<<" Graph "<<s+1<<" : "<<opj.graphName(s)<<" (ParentFolder : "<<opj.graphParentFolder(s)<<")"<<endl;
+ kdDebug()<<" Graph "<<s+1<<" : "<<opj.graphName(s)<<endl; //" (ParentFolder : "<<opj.graphParentFolder(s)<<")"<<endl;
kdDebug()<<" Label : "<<opj.graphLabel(s)<<" Layers : "<<opj.numLayers(s)<<endl;
Worksheet *work = mw->newWorksheet();
@@ -139,8 +177,10 @@ int ImportOPJ::import() {
#else
kdDebug()<<"Layer x axis : "<<opj.layerXAxisTitle(s,l).txt<<endl;
kdDebug()<<"Layer y axis : "<<opj.layerYAxisTitle(s,l).txt<<endl;
- Label *xlabel = new Label(parseOriginText(opj.layerXAxisTitle(s,l).txt));
- Label *ylabel = new Label(parseOriginText(opj.layerYAxisTitle(s,l).txt));
+
+ // The name Label is ambiguous, therefore use LPLabel here.
+ LPLabel *xlabel = new LPLabel(parseOriginText(opj.layerXAxisTitle(s,l).txt));
+ LPLabel *ylabel = new LPLabel(parseOriginText(opj.layerYAxisTitle(s,l).txt));
kdDebug()<<"Layer legend : "<<opj.layerLegend(s,l).txt<<endl;
#endif
plot->getAxis(0)->setLabel(xlabel);
@@ -342,11 +382,11 @@ int ImportOPJ::import() {
}
// axis range
- vector<double> xrange=opj.layerXRange(s,l);
- vector<double> yrange=opj.layerYRange(s,l);
+ graphLayerRange xrange=opj.layerXRange(s,l);
+ graphLayerRange yrange=opj.layerYRange(s,l);
LRange range[2];
- range[0] = LRange(xrange[0],xrange[1]);
- range[1] = LRange(yrange[0],yrange[1]);
+ range[0] = LRange(xrange.min,xrange.max);
+ range[1] = LRange(yrange.min,yrange.max);
plot->setActRanges(range);
// axis scale
diff --git a/src/Label.h b/src/Label.h
index b61c55b..5aa7097 100644
--- a/src/Label.h
+++ b/src/Label.h
@@ -66,4 +66,10 @@ private:
bool is_texlabel; // if it is a tex label
};
+// <liborigin/OPJFile.h> defines an enumerator of the type ColumnType with
+// the name Label in the global namespace. Since the class Label defined in
+// this file ("Label.h") collides with the aforementioned enumerator in
+// "ImportOPJ.cc" we define a synonym for Label here to avoid the ambiguity.
+typedef Label LPLabel;
+
#endif //LABEL_H
--- NEW FILE import.log ---
LabPlot-1_6_0_2-2_fc10:F-8:LabPlot-1.6.0.2-2.fc10.src.rpm:1226425549
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 6 Aug 2007 10:10:16 -0000 1.3
+++ .cvsignore 11 Nov 2008 17:47:07 -0000 1.4
@@ -1 +1 @@
-LabPlot-1.5.1.6.tar.bz2
+LabPlot-1.6.0.2.tar.bz2
Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/F-8/LabPlot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LabPlot.spec 23 Aug 2007 14:31:01 -0000 1.6
+++ LabPlot.spec 11 Nov 2008 17:47:07 -0000 1.7
@@ -1,6 +1,6 @@
Name: LabPlot
-Version: 1.5.1.6
-Release: 4%{?dist}
+Version: 1.6.0.2
+Release: 2%{?dist}
Summary: Data Analysis and Visualization
License: GPLv2+
@@ -10,13 +10,17 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
-BuildRequires: kdelibs-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
+Patch2: LabPlot-20080225.patch
+
+BuildRequires: kdelibs3-devel libselinux-devel desktop-file-utils libexif-devel netcdf-devel
BuildRequires: gsl-devel ImageMagick-c++-devel fftw-devel jasper-devel qwtplot3d-devel
BuildRequires: pstoedit libtool qt-qsa-devel gettext htmldoc audiofile-devel ocaml
-BuildRequires: liborigin-devel
+BuildRequires: liborigin-devel qhull-devel
ExcludeArch: ppc64
+Requires: electronics-menu
+
%description
LabPlot is for scientific 2D and 3D data and function plotting.
The various display and analysis functions are explained in the
@@ -106,7 +110,10 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
+
+%patch2 -p1 -b .orig
+
%{__sed} -i.system-wide -e 's|\.\./liborigin/libLabPlotorigin.la||' src/Makefile.in
%{__sed} -i -e '/^libLabPlot_la_LDFLAGS/s|^\(.*\) \\$|\1 -lorigin \\|' src/Makefile.in
@@ -114,6 +121,7 @@
%{__sed} -i.symbol -e '/^LIBS =/s|^\(.*\)|\1 -lm|' cephes/Makefile.in
%{__sed} -i.subdir -e '/^SUBDIR/s|liborigin||' Makefile.in
+%{__sed} -i "s|Terminal=yes|Terminal=false|" src/%{name}.desktop
set +x
for f in `find . -name \*.map -or -name \*.MAP | sort` ; do
@@ -144,11 +152,14 @@
--enable-jasper \
--enable-ImageMagick \
--enable-netcdf \
- --enable-audiofile \
- --enable-gl \
+ --enable-qhull \
+ --enable-system-netcdf \
+ --enable-audiofile \
+ --enable-gl \
--enable-system-qwtplot3d \
- --enable-libundo \
-
+ --enable-libundo \
+ --enable-system-liborigin \
+ --with-qt-librairies=%{_libdir}/qt3
# clean unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -161,22 +172,26 @@
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
-
+# LabPlot is considered to be part of Fedora Electronic LAb
+# Compared to qtiplot, LabPlot provides support to various Oscilloscopes.
desktop-file-install --vendor fedora \
--delete-original \
--remove-category Education \
+ --remove-category Science \
+ --remove-category Physics \
+ --remove-category Maths \
+ --add-category "Electronics" \
--dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/kde/%{name}.desktop
-
#Building pdf handbook for different languages
pushd doc
for LANG in * ; do
- if [ -d $LANG -a $LANG != small_pics -a $LANG != html -a $LANG != fr ]; then
+ if [ -d $LANG -a $LANG != small_pics -a $LANG != html -a $LANG != fr -a $LANG != Scripting ]; then
echo "[Fedora-%{name}] building pdf handbook for %{name}-%{version} (language $LANG) ..."
- %{__mkdir} tmp/
+ %{__mkdir} -p tmp/
%{__cp} -p $LANG/index.docbook tmp/
%{__cp} -pRL en/common/ en/small_pics/ tmp/
@@ -187,7 +202,7 @@
htmldoc -f ../%{name}-%{version}-$LANG.pdf index.html
popd
- %{__rm} -rf tmp/
+ %{__rm} -rf emp/
echo "Done"
fi
@@ -245,6 +260,7 @@
%{__rm} -f %{buildroot}%{_libdir}/lib%{name}.so
%{__rm} -f %{buildroot}%{_libdir}/lib%{name}cephes.so
+%{__rm} -f %{buildroot}%{_libdir}/lib%{name}netCDF.so
%clean
@@ -279,13 +295,13 @@
%{_datadir}/apps/%{name}/
%{_datadir}/icons/??color/??x??/apps/%{name}.png
%{_datadir}/icons/??color/??x??/mimetypes/lpl.png
-%{_datadir}/mimelnk/application/x-lpl.desktop
+%{_datadir}/mimelnk/application/x-l?l.desktop
%{_libdir}/lib%{name}.so.1*
%{_libdir}/lib%{name}cephes.so.1*
+%{_libdir}/lib%{name}netCDF.so.*
# needed on Help -> LabPlot Handbook
%{_docdir}/HTML/en/%{name}/
-
%files doc
%defattr(-,root,root,-)
%doc doc/html/
@@ -335,6 +351,28 @@
%Changelog
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.0.2-2
+- handle libLabPlotnetCDF.so*
+
+* Wed Sep 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.0.2-1
+- update to 1.6.0.2
+- drop useless gcc43 patch, init-smg-before-open-files patch
+
+* Tue Jun 10 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.0.1-1
+- New upstream release 1.6.0.1
+- Now compatible with liborigin 20080225
+- Bugfix: #449653: FTBFS LabPlot-1.5.1.6-6.fc9
+- Bugfix: #434019: LabPlot failed massrebuild attempt for GCC 4.3
+- Added qhull-devel as BR
+
+* Tue Jun 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.1.6-7
+- fix build against latest liborigin on F10 (backported from 1.6.0)
+
+* Sun Apr 12 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 1.5.1.6-6
+- Fixes for GCC 4.3
+- Updated dependencies
+- Now requires electronics-menu
+
* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.1.6-4
- complying to freedesktop policies - categories
- queued for mass rebuild for Fedora 8 - BuildID
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 6 Aug 2007 10:10:16 -0000 1.3
+++ sources 11 Nov 2008 17:47:07 -0000 1.4
@@ -1 +1 @@
-920a6f9510de577ac31093b2783c08f0 LabPlot-1.5.1.6.tar.bz2
+59a9448190b2ebc9b23670f9262a1947 LabPlot-1.6.0.2.tar.bz2
- Previous message (by thread): rpms/kernel/F-10 linux-2.6-alsa-revo51-headphone.patch, NONE, 1.1 kernel.spec, 1.1132, 1.1133
- Next message (by thread): rpms/LabPlot/F-9 LabPlot-20080225.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 LabPlot.spec, 1.10, 1.11 sources, 1.3, 1.4 LabPlot-gcc43.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list