rpms/qtoctave/F-11 qtoctave-0.9.1-doc-path.patch, NONE, 1.1 qtoctave-qt-version.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 qtoctave.spec, 1.5, 1.6 sources, 1.4, 1.5 qtoctave-includes.patch, 1.2, NONE

Tue Apr 20 21:54:29 UTC 2010

Author: nucleo

Update of /cvs/pkgs/rpms/qtoctave/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19797

Modified Files:
	.cvsignore qtoctave.spec sources 
Added Files:
	qtoctave-0.9.1-doc-path.patch qtoctave-qt-version.patch 
Removed Files:
	qtoctave-includes.patch 
Log Message:
Update to 0.9.1

qtoctave-0.9.1-doc-path.patch:
 CMakeLists.txt |    2 +-
 configure.h.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qtoctave-0.9.1-doc-path.patch ---
--- qtoctave-0.9.1/qtoctave/src/CMakeLists.txt	2010-01-25 15:19:48.000000000 +0200
+++ qtoctave-0.9.1/qtoctave/src/CMakeLists.txt	2010-04-21 00:03:03.000000000 +0300
@@ -52,7 +52,7 @@
 
 install (
 	DIRECTORY qtoctave_doc
-	DESTINATION share/doc/qtoctave
+	DESTINATION share/qtoctave
 	PATTERN ".svn" EXCLUDE
 	)
 
--- qtoctave-0.9.1/qtoctave/src/configure.h.in	2010-01-25 15:19:50.000000000 +0200
+++ qtoctave-0.9.1/qtoctave/src/configure.h.in	2010-04-21 00:03:12.000000000 +0300
@@ -5,7 +5,7 @@
 #define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-html/octave_doc/index.html"
 #define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
 #define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
-#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/qtoctave/qtoctave_doc/index.html"
+#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
 
 #define PKG_CMD_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/pkg-commands.list"
 #endif

qtoctave-qt-version.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qtoctave-qt-version.patch ---
--- qtoctave-0.9.1/CMakeLists.txt	2010-01-25 15:19:48.000000000 +0200
+++ qtoctave-0.9.1/CMakeLists.txt	2010-04-21 00:33:08.000000000 +0300
@@ -28,13 +28,13 @@
 
 include(UseQt4)
 
-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6   )
+if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5   )
 	MESSAGE (FATAL_ERROR 
 			"Qt version 4.6 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 6   )
+endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR ${QT_VERSION_MINOR} LESS 5   )
 
 add_subdirectory (qtoctave_pkg/src)
 add_subdirectory (xmlwidget/qt4)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	28 Jan 2010 04:08:59 -0000	1.4
+++ .cvsignore	20 Apr 2010 21:54:29 -0000	1.5
@@ -1 +1 @@
-qtoctave-0.8.2.tar.gz
+qtoctave-0.9.1.tar.bz2


Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-11/qtoctave.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- qtoctave.spec	28 Jan 2010 04:08:59 -0000	1.5
+++ qtoctave.spec	20 Apr 2010 21:54:29 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           qtoctave
-Version:        0.8.2
-Release:        2%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Frontend for Octave
 
 Group:          Applications/Engineering
 License:        GPLv2
 URL:            http://qtoctave.wordpress.com/
-Source0:        http://forja.rediris.es/frs/download.php/1383/%{name}-%{version}.tar.gz
+Source0:        http://forja.rediris.es/frs/download.php/1760/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.5.0
@@ -15,14 +15,18 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  cmake
 Requires:       octave >= 3.2.0
 
-Patch0:         qtoctave-includes.patch
+# place qtoctave_doc in qtoctave datadir
+Patch0:         qtoctave-0.9.1-doc-path.patch
+# fix build with different Qt versions
+Patch1:         qtoctave-qt-version.patch
 
 %description
 QtOctave is a frontend for Octave based on Qt4.
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
+%patch0 -p1
+%patch1 -p1
 
 find xmlwidget/qt4/src/ -type f -exec chmod a-x {} \;
 find easy_plot/src/ -type f -exec chmod a-x {} \;
@@ -69,6 +73,7 @@ fi
 %doc readme.txt LICENSE_GPL.txt
 %{_bindir}/%{name}
 %{_bindir}/easy_plot
+%{_bindir}/qtinfo
 %{_bindir}/qtjs
 %{_bindir}/qtoctave_pkg
 %{_bindir}/simplercs
@@ -77,8 +82,12 @@ fi
 %{_datadir}/applications/fedora-qtoctave.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
+%exclude %{_datadir}/doc/octave-html
 
 %changelog
+* Fri Apr  2 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.9.1-1
+- update to 0.9.1
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	28 Jan 2010 04:08:59 -0000	1.4
+++ sources	20 Apr 2010 21:54:29 -0000	1.5
@@ -1 +1 @@
-56d0d7bece168b7df6a6b30d448266f4  qtoctave-0.8.2.tar.gz
+a15edc82c6780dc3764052b04bf902f0  qtoctave-0.9.1.tar.bz2


--- qtoctave-includes.patch DELETED ---

