rpms/qtoctave/F-13 qtoctave-info.patch, NONE, 1.1 qtoctave.spec, 1.9, 1.10

[nucleo]

Author: nucleo

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

Modified Files:
	qtoctave.spec 
Added Files:
	qtoctave-info.patch 
Log Message:
qtinfo renamed to qtoctave-info (#590357)

qtoctave-info.patch:
 qtinfo/CMakeLists.txt                |    1 +
 qtoctave/src/scripts_octave/qtinfo.m |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE qtoctave-info.patch ---
--- qtoctave-0.9.1/qtinfo/CMakeLists.txt	2010-01-25 15:19:51.000000000 +0200
+++ qtoctave-0.9.1/qtinfo/CMakeLists.txt	2010-05-09 16:02:41.000000000 +0300
@@ -33,6 +33,7 @@
 	PROPERTIES INSTALL_RPATH ":usr/lib"
 	BUILD_WITH_INSTALL_RPATH true
 	INSTALL_RPATH_USE_LINK_PATH true
+	OUTPUT_NAME qtoctave-info
 )
 
 TARGET_LINK_LIBRARIES(qtinfo 
--- qtoctave-0.9.1/qtoctave/src/scripts_octave/qtinfo.m	2010-01-25 15:19:50.000000000 +0200
+++ qtoctave-0.9.1/qtoctave/src/scripts_octave/qtinfo.m	2010-05-09 16:02:19.000000000 +0300
@@ -1,5 +1,5 @@
 function qtinfo()
-	command=sprintf("qtinfo %s > /dev/null", info_file);
+	command=sprintf("qtoctave-info %s > /dev/null", info_file);
 	printf("Starting info: %s\n", command);
 	system(command, 1, "async");
 endfunction
\ No newline at end of file


Index: qtoctave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtoctave/F-13/qtoctave.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qtoctave.spec	20 Apr 2010 21:46:45 -0000	1.9
+++ qtoctave.spec	9 May 2010 16:33:37 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           qtoctave
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Frontend for Octave
 
 Group:          Applications/Engineering
@@ -19,6 +19,9 @@ Requires:       octave >= 3.2.0
 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
 
 %description
 QtOctave is a frontend for Octave based on Qt4.
@@ -27,6 +30,7 @@ QtOctave is a frontend for Octave based 
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 find xmlwidget/qt4/src/ -type f -exec chmod a-x {} \;
 find easy_plot/src/ -type f -exec chmod a-x {} \;
@@ -73,7 +77,7 @@ fi
 %doc readme.txt LICENSE_GPL.txt
 %{_bindir}/%{name}
 %{_bindir}/easy_plot
-%{_bindir}/qtinfo
+%{_bindir}/qtoctave-info
 %{_bindir}/qtjs
 %{_bindir}/qtoctave_pkg
 %{_bindir}/simplercs
@@ -85,6 +89,9 @@ fi
 %exclude %{_datadir}/doc/octave-html
 
 %changelog
+* Sun May  9 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.9.1-2
+- qtinfo renamed to qtoctave-info (#590357)
+
 * Fri Apr  2 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.9.1-1
 - update to 0.9.1