[qtoctave] Update to 0.10.1
nucleo
nucleo at fedoraproject.org
Sun Feb 6 16:26:57 UTC 2011
commit 3d7974f6fc11c9555c30d7cc99f83a0c3d8a2800
Author: nucleo <nucleo at fedoraproject.org>
Date: Sun Feb 6 18:26:52 2011 +0200
Update to 0.10.1
.gitignore | 1 +
qtoctave-0.9.1-doc-path.patch | 22 --------------
qtoctave-doc-path.patch | 64 +++++++++++++++++++++++++++++++++++++++++
qtoctave-info.patch | 20 -------------
qtoctave-qt-version.patch | 18 -----------
qtoctave.spec | 26 +++++++---------
sources | 2 +-
7 files changed, 78 insertions(+), 75 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5abdaf..5244523 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
qtoctave-0.9.1.tar.bz2
+/qtoctave-0.10.1.tar.gz
diff --git a/qtoctave-doc-path.patch b/qtoctave-doc-path.patch
new file mode 100644
index 0000000..481520b
--- /dev/null
+++ b/qtoctave-doc-path.patch
@@ -0,0 +1,64 @@
+--- qtoctave-0.10.1/qtjs/CMakeLists.txt 2011-01-06 23:48:05.000000000 +0200
++++ qtoctave-0.10.1/qtjs/CMakeLists.txt 2011-02-06 18:16:37.000000000 +0200
+@@ -2,10 +2,5 @@
+
+ install(
+ DIRECTORY doc
+- DESTINATION share/doc/qtoctave-utils/qtjs
++ DESTINATION share/qtoctave/qtjs
+ )
+-
+-install(
+- FILES "instalar.txt" "install.txt"
+- DESTINATION share/doc/qtoctave-utils/qtjs
+-)
+\ No newline at end of file
+--- qtoctave-0.10.1/qtoctave/src/CMakeLists.txt 2011-01-06 23:48:07.000000000 +0200
++++ qtoctave-0.10.1/qtoctave/src/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200
+@@ -74,7 +74,7 @@
+
+ install (
+ DIRECTORY qtoctave_doc
+- DESTINATION share/doc/qtoctave
++ DESTINATION share/qtoctave
+ PATTERN ".svn" EXCLUDE
+ )
+
+--- qtoctave-0.10.1/qtoctave/src/configure.h.in 2011-01-06 23:48:06.000000000 +0200
++++ qtoctave-0.10.1/qtoctave/src/configure.h.in 2011-02-06 18:15:41.000000000 +0200
+@@ -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-0.10.1/simple_rcs/CMakeLists.txt 2011-01-06 23:48:06.000000000 +0200
++++ qtoctave-0.10.1/simple_rcs/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200
+@@ -17,6 +17,6 @@
+
+ install(
+ DIRECTORY design
+- DESTINATION share/doc/qtoctave-utils/simple_rcs
++ DESTINATION share/qtoctave/simple_rcs
+ PATTERN ".svn" EXCLUDE
+ )
+\ No newline at end of file
+--- qtoctave-0.10.1/xmlwidget/CMakeLists.txt 2011-01-06 23:48:06.000000000 +0200
++++ qtoctave-0.10.1/xmlwidget/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200
+@@ -2,10 +2,10 @@
+
+ install(
+ DIRECTORY doc
+- DESTINATION share/doc/qtoctave-utils/xmlwidget
++ DESTINATION share/qtoctave/xmlwidget
+ )
+
+ install(
+ DIRECTORY examples
+- DESTINATION share/doc/qtoctave-utils/xmlwidget
++ DESTINATION share/qtoctave/xmlwidget
+ )
+\ No newline at end of file
diff --git a/qtoctave.spec b/qtoctave.spec
index a63e41c..6f1dc7b 100644
--- a/qtoctave.spec
+++ b/qtoctave.spec
@@ -1,27 +1,22 @@
Name: qtoctave
-Version: 0.9.1
-Release: 2%{?dist}
+Version: 0.10.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/1760/%{name}-%{version}.tar.bz2
+Source0: http://forja.rediris.es/frs/download.php/2054/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt4-devel >= 4.5.0
+BuildRequires: qt4-devel >= 4.6.0
BuildRequires: octave-devel >= 3.2.0
BuildRequires: desktop-file-utils
BuildRequires: cmake
Requires: octave >= 3.2.0
-# 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
-#qtinfo conflicts with libquicktime-utils
-#renamed to qtoctave-info
-Patch2: qtoctave-info.patch
+# place qtoctave_doc and qtoctave-utils in qtoctave datadir
+Patch0: qtoctave-doc-path.patch
%description
QtOctave is a frontend for Octave based on Qt4.
@@ -29,8 +24,8 @@ QtOctave is a frontend for Octave based on Qt4.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
+sed -i 's|"lrelease"|"lrelease-qt4"|g' qtoctave/src/CMakeLists.txt
find xmlwidget/qt4/src/ -type f -exec chmod a-x {} \;
find easy_plot/src/ -type f -exec chmod a-x {} \;
@@ -77,7 +72,7 @@ fi
%doc readme.txt LICENSE_GPL.txt
%{_bindir}/%{name}
%{_bindir}/easy_plot
-%{_bindir}/qtoctave-info
+%{_bindir}/qtoctave-info-reader
%{_bindir}/qtjs
%{_bindir}/qtoctave_pkg
%{_bindir}/simplercs
@@ -89,6 +84,9 @@ fi
%exclude %{_datadir}/doc/octave-html
%changelog
+* Sun Feb 6 2011 Alexey Kurov <nucleo at fedoraproject.org> - 0.10.1-1
+- update to 0.10.1
+
* Sun May 9 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.9.1-2
- qtinfo renamed to qtoctave-info (#590357)
diff --git a/sources b/sources
index 3130e94..a699ab7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a15edc82c6780dc3764052b04bf902f0 qtoctave-0.9.1.tar.bz2
+f23afd8eb850b950f51b65f256a83835 qtoctave-0.10.1.tar.gz
More information about the scm-commits
mailing list