rpms/qtoctave/F-12 .cvsignore, 1.3, 1.4 qtoctave-includes.patch, 1.1, 1.2 qtoctave.spec, 1.5, 1.6 sources, 1.3, 1.4
nucleo
nucleo at fedoraproject.org
Thu Jan 28 04:05:52 UTC 2010
- Previous message: rpms/qtoctave/devel qtoctave.spec,1.7,1.8
- Next message: rpms/qtoctave/F-11 .cvsignore, 1.3, 1.4 qtoctave-includes.patch, 1.1, 1.2 qtoctave.spec, 1.4, 1.5 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nucleo
Update of /cvs/pkgs/rpms/qtoctave/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30504
Modified Files:
.cvsignore qtoctave-includes.patch qtoctave.spec sources
Log Message:
Update to version 0.8.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 1 Sep 2008 21:23:18 -0000 1.3
+++ .cvsignore 28 Jan 2010 04:05:51 -0000 1.4
@@ -1 +1 @@
-qtoctave-0.8.1-20080823.svn165.tar.gz
+qtoctave-0.8.2.tar.gz
qtoctave-includes.patch:
CMakeLists.txt | 4 ++--
easy_plot/src/gnuplot_connection.cpp | 1 +
qtoctave/src/search_dialog.cpp | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
Index: qtoctave-includes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-12/qtoctave-includes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qtoctave-includes.patch 6 Mar 2009 11:56:34 -0000 1.1
+++ qtoctave-includes.patch 28 Jan 2010 04:05:51 -0000 1.2
@@ -1,9 +1,36 @@
-diff -ru qtoctave.orig/src/search_dialog.cpp qtoctave/src/search_dialog.cpp
---- qtoctave.orig/src/search_dialog.cpp 2009-03-06 11:24:39.000000000 +0000
-+++ qtoctave/src/search_dialog.cpp 2009-03-06 11:25:01.000000000 +0000
+--- qtoctave-0.8.2/easy_plot/src/gnuplot_connection.cpp 2009-03-27 11:46:45.000000000 +0200
++++ qtoctave-0.8.2/easy_plot/src/gnuplot_connection.cpp 2009-11-09 04:35:09.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include <QXmlStreamReader>
+ #include <QXmlStreamWriter>
+ #include <QHash>
++#include <stdio.h>
+
+ GnuplotConnection::GnuplotConnection(QObject *parent):QProcess(parent)
+ {
+--- qtoctave-0.8.2/qtoctave/src/search_dialog.cpp 2009-05-28 18:16:19.000000000 +0300
++++ qtoctave-0.8.2/qtoctave/src/search_dialog.cpp 2009-11-09 04:35:24.000000000 +0200
@@ -1,4 +1,5 @@
#include "search_dialog.h"
+#include <stdio.h>
SearchDialog::SearchDialog(QWidget *parent): QDialog(parent)
{
+--- qtoctave-0.8.2/CMakeLists.txt 2009-06-29 18:26:22.000000000 +0300
++++ qtoctave-0.8.2/CMakeLists.txt 2010-01-28 05:28:05.000000000 +0200
+@@ -28,13 +28,13 @@
+
+ include(UseQt4)
+
+-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 5 )
++if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5 )
+ MESSAGE (FATAL_ERROR
+ "Qt version 4.5 required.\n"
+ "Qt version installed is: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}\n"
+ "Please install required version.\n"
+ )
+-endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 5 )
++endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5 )
+
+
+
Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-12/qtoctave.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- qtoctave.spec 27 Jul 2009 02:37:44 -0000 1.5
+++ qtoctave.spec 28 Jan 2010 04:05:51 -0000 1.6
@@ -1,23 +1,19 @@
Name: qtoctave
-Version: 0.8.1
-Release: 0.20080826.svn165%{?dist}
+Version: 0.8.2
+Release: 2%{?dist}
Summary: Frontend for Octave
Group: Applications/Engineering
License: GPLv2
URL: http://qtoctave.wordpress.com/
-# The source for this package was checked out from svn trunk.
-# Use the following command to generate the tarball:
-# svn checkout https://forja.rediris.es/svn/csl-qtoctave/trunk/qtoctave
-# tar -czvf qtoctave-0.8.1-20080823.svn165.tar.gz qtoctave
-Source0: %{name}-%{version}-20080823.svn165.tar.gz
+Source0: http://forja.rediris.es/frs/download.php/1383/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt4-devel, octave-devel
+BuildRequires: qt4-devel >= 4.5.0
+BuildRequires: octave-devel >= 3.2.0
BuildRequires: desktop-file-utils
-BuildRequires: dos2unix
BuildRequires: cmake
-Requires: octave
+Requires: octave >= 3.2.0
Patch0: qtoctave-includes.patch
@@ -25,13 +21,11 @@ Patch0: qtoctave-includes.patch
QtOctave is a frontend for Octave based on Qt4.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1 -b .includes
-dos2unix readme.txt
-for SVNDIR in $(find . -type d -name .svn)
- do rm -rf $SVNDIR
-done
-find src/ -type f -exec chmod a-x {} \;
+
+find xmlwidget/qt4/src/ -type f -exec chmod a-x {} \;
+find easy_plot/src/ -type f -exec chmod a-x {} \;
%build
@@ -72,14 +66,25 @@ fi
%files
%defattr(-,root,root,-)
-%doc readme.txt news.txt leeme.txt LICENSE_GPL.txt
+%doc readme.txt LICENSE_GPL.txt
%{_bindir}/%{name}
+%{_bindir}/easy_plot
+%{_bindir}/qtjs
+%{_bindir}/qtoctave_pkg
+%{_bindir}/simplercs
+%{_bindir}/xmlwidget
%{_datadir}/%{name}
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/fedora-qtoctave.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%changelog
+* Thu Jan 28 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.8.2-2
+- fixed BR qt4-devel >= 4.5.0, octave-devel >= 3.2.0
+
+* Thu Jan 28 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.8.2-1
+- update to 0.8.2
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-0.20080826.svn165
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 1 Sep 2008 21:23:18 -0000 1.3
+++ sources 28 Jan 2010 04:05:51 -0000 1.4
@@ -1 +1 @@
-ea7aeeaa1eb180007c9a53fbe566a727 qtoctave-0.8.1-20080823.svn165.tar.gz
+56d0d7bece168b7df6a6b30d448266f4 qtoctave-0.8.2.tar.gz
- Previous message: rpms/qtoctave/devel qtoctave.spec,1.7,1.8
- Next message: rpms/qtoctave/F-11 .cvsignore, 1.3, 1.4 qtoctave-includes.patch, 1.1, 1.2 qtoctave.spec, 1.4, 1.5 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list