rpms/LabPlot/devel LabPlot-20080225.patch, NONE, 1.1 LabPlot-init-smg-before-open-files.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-1.5.1.6-liborigin.patch, 1.1, NONE

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/pkgs/rpms/LabPlot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22273/devel

Modified Files:
	.cvsignore LabPlot.spec sources 
Added Files:
	LabPlot-20080225.patch 
	LabPlot-init-smg-before-open-files.patch import.log 
Removed Files:
	LabPlot-1.5.1.6-liborigin.patch 
Log Message:
new upstream release and fixes for rawhide

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

LabPlot-init-smg-before-open-files.patch:

--- NEW FILE LabPlot-init-smg-before-open-files.patch ---
diff --git src/MainWin.cc src/MainWin.cc
index 85d0350..bc3a83e 100644
--- a/src/MainWin.cc
+++ b/src/MainWin.cc
@@ -218,11 +218,6 @@ MainWin::MainWin(const char *name, const char *filen, bool is_part)
 		readScript(fn);
 #endif
 
-	if(QFile::exists(fn) && fn.contains(".lpl"))
-		openLPL(fn);
-	else if(QFile::exists(fn) && ( fn.contains(".lml") || fn.contains(".xml") ))
-		openXML(fn);
-
 	modified = false;
 	is_fullscreen=false;
 
@@ -231,6 +226,10 @@ MainWin::MainWin(const char *name, const char *filen, bool is_part)
 	smg = new QSignalMapper(this);
 	connect(smg,SIGNAL(mapped(int)),this,SLOT(changeGraph(int)));
 
+	if(QFile::exists(fn) && fn.contains(".lpl"))
+		openLPL(fn);
+	else if(QFile::exists(fn) && ( fn.contains(".lml") || fn.contains(".xml") ))
+		openXML(fn);
 }
 
 MainWin::~MainWin() {


--- NEW FILE import.log ---
LabPlot-1_6_0_1-1_fc9:HEAD:LabPlot-1.6.0.1-1.fc9.src.rpm:1213120901


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/.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	10 Jun 2008 18:02:48 -0000	1.4
@@ -1 +1 @@
-LabPlot-1.5.1.6.tar.bz2
+LabPlot-1.6.0.1-2.tar.bz2


Index: LabPlot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/LabPlot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LabPlot.spec	10 Jun 2008 15:08:30 -0000	1.10
+++ LabPlot.spec	10 Jun 2008 18:02:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:              LabPlot
-Version:           1.5.1.6
-Release:           7%{?dist}
+Version:           1.6.0.1
+Release:           1%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPLv2+
@@ -8,19 +8,20 @@
 URL:               http://labplot.sourceforge.net/
 
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}.tar.bz2
+Source0:           http://downloads.sourceforge.net/labplot/%{name}-%{version}-2.tar.bz2
 
 Patch0:            LabPlot-gcc43.patch
-Patch1:            LabPlot-1.5.1.6-liborigin.patch
+Patch1: 	   LabPlot-init-smg-before-open-files.patch
+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
+Requires:	   electronics-menu
 
 %description
 LabPlot is for scientific 2D and 3D data and function plotting.
@@ -111,12 +112,11 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.6.0.1
 
 %patch0 -p1 -b .orig
-%if 0%{?fedora} > 9
-%patch1 -p1 -b .liborigin
-%endif
+%patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
 
 
 %{__sed} -i.system-wide -e 's|\.\./liborigin/libLabPlotorigin.la||' src/Makefile.in
@@ -125,6 +125,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
@@ -155,10 +156,13 @@
   --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
@@ -172,23 +176,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/
 
@@ -199,7 +206,7 @@
     htmldoc -f ../%{name}-%{version}-$LANG.pdf index.html
 
     popd
-    %{__rm} -rf tmp/
+    %{__rm} -rf emp/
 
     echo "Done"
   fi
@@ -291,13 +298,12 @@
 %{_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*
 # needed on Help -> LabPlot Handbook
 %{_docdir}/HTML/en/%{name}/
 
-
 %files doc
 %defattr(-,root,root,-)
 %doc doc/html/
@@ -347,6 +353,13 @@
 
 
 %Changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/LabPlot/devel/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	10 Jun 2008 18:02:48 -0000	1.4
@@ -1 +1 @@
-920a6f9510de577ac31093b2783c08f0  LabPlot-1.5.1.6.tar.bz2
+869726e8c0fe7376a8d3c039f6e02298  LabPlot-1.6.0.1-2.tar.bz2


--- LabPlot-1.5.1.6-liborigin.patch DELETED ---