rpms/hercstudio/EL-5 hercstudio-vector.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 hercstudio-qt42.patch, 1.1, 1.2 hercstudio.spec, 1.3, 1.4 sources, 1.3, 1.4

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24136

Modified Files:
	.cvsignore hercstudio-qt42.patch hercstudio.spec sources 
Added Files:
	hercstudio-vector.patch 
Log Message:
* Sat Jan 16 2010 Dan Horák <dan[at]danny.cz> - 1.1.0-1
- update to 1.1.0


hercstudio-vector.patch:
 DeviceTypes.h |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE hercstudio-vector.patch ---
diff -up HerculesStudio/HercConfiguration/DeviceTypes.h.vector HerculesStudio/HercConfiguration/DeviceTypes.h
--- HerculesStudio/HercConfiguration/DeviceTypes.h.vector	2010-01-16 12:27:03.000000000 +0100
+++ HerculesStudio/HercConfiguration/DeviceTypes.h	2010-01-16 12:27:12.000000000 +0100
@@ -30,6 +30,7 @@
 #define DEVICETYPES_H_
 
 #include <QIcon>
+#include <vector>
 
 class DeviceTypes
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Oct 2009 09:21:47 -0000	1.3
+++ .cvsignore	16 Jan 2010 12:25:37 -0000	1.4
@@ -1 +1 @@
-herculesstudio-1.0.0-src.tar.gz
+herculesstudio-1.1.0-src.tar.gz

hercstudio-qt42.patch:
 HercConfiguration/Configuration.ui |  216 -------------------------------------
 HercStudio/MainWindow.cpp          |    1 
 2 files changed, 217 deletions(-)

Index: hercstudio-qt42.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/hercstudio-qt42.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercstudio-qt42.patch	30 Sep 2009 09:36:12 -0000	1.1
+++ hercstudio-qt42.patch	16 Jan 2010 12:25:37 -0000	1.2
@@ -1,40 +1,6 @@
-From 4410cca1e3edea8f9b3bef2ed87d4cc0949248b3 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
-Date: Thu, 17 Sep 2009 12:27:30 +0200
-Subject: [PATCH 1/2] remove call of method unsupported in qt 4.2
-
----
- HerculesStudio/HercStudio/mainwindow.cpp |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/HerculesStudio/HercStudio/mainwindow.cpp b/HerculesStudio/HercStudio/mainwindow.cpp
-index e8c468b..c62cb26 100644
---- a/HerculesStudio/HercStudio/mainwindow.cpp
-+++ b/HerculesStudio/HercStudio/mainwindow.cpp
-@@ -537,7 +537,6 @@ void MainWindow::deleteMessages()
-         msgBox.setText("Messages belong to to a running Hercules.");
-         msgBox.setInformativeText("Are you sure you want to delete history messages?");
-         msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
--        msgBox.setDefaultButton(QMessageBox::Yes);
-         msgBox.setIcon(QMessageBox::Warning);
-         int ret = msgBox.exec();
-         if (ret != QMessageBox::Yes)
--- 
-1.6.3.3
-
-From deddadf39bc61fff47035ff2c028b3173d25d069 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
-Date: Thu, 17 Sep 2009 12:29:52 +0200
-Subject: [PATCH 2/2] remove items unsupported in qt 4.2
-
----
- HerculesStudio/HercConfiguration/Configuration.ui |  216 ---------------------
- 1 files changed, 0 insertions(+), 216 deletions(-)
-
-diff --git a/HerculesStudio/HercConfiguration/Configuration.ui b/HerculesStudio/HercConfiguration/Configuration.ui
-index bce9ca0..b2b92cc 100644
---- a/HerculesStudio/HercConfiguration/Configuration.ui
-+++ b/HerculesStudio/HercConfiguration/Configuration.ui
+diff -Nrup hercstudio.orig/HerculesStudio/HercConfiguration/Configuration.ui hercstudio/HerculesStudio/HercConfiguration/Configuration.ui
+--- hercstudio.orig/HerculesStudio/HercConfiguration/Configuration.ui	2009-12-12 17:13:46.000000000 +0100
++++ hercstudio/HerculesStudio/HercConfiguration/Configuration.ui	2009-12-15 11:31:44.000000000 +0100
 @@ -968,24 +968,6 @@ p, li { white-space: pre-wrap; }
             </color>
            </brush>
@@ -335,6 +301,14 @@ index bce9ca0..b2b92cc 100644
          </disabled>
         </palette>
        </property>
--- 
-1.6.3.3
-
+diff -Nrup hercstudio.orig/HerculesStudio/HercStudio/MainWindow.cpp hercstudio/HerculesStudio/HercStudio/MainWindow.cpp
+--- hercstudio.orig/HerculesStudio/HercStudio/MainWindow.cpp	2009-11-13 07:54:21.000000000 +0100
++++ hercstudio/HerculesStudio/HercStudio/MainWindow.cpp	2009-12-15 11:33:16.000000000 +0100
+@@ -557,7 +557,6 @@ void MainWindow::deleteMessages()
+         msgBox.setText("Messages belong to to a running Hercules.");
+         msgBox.setInformativeText("Are you sure you want to delete history messages?");
+         msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+-        msgBox.setDefaultButton(QMessageBox::Yes);
+         msgBox.setIcon(QMessageBox::Warning);
+         int ret = msgBox.exec();
+         if (ret != QMessageBox::Yes)


Index: hercstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/hercstudio.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- hercstudio.spec	16 Oct 2009 09:21:47 -0000	1.3
+++ hercstudio.spec	16 Jan 2010 12:25:38 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           hercstudio
-Version:        1.0.0
+Version:        1.1.0
 Release:        1%{?dist}
 Summary:        GUI front-end to the Hercules mainframe Emulator
 
@@ -10,6 +10,7 @@ Source0:        http://www.mvsdasd.org/h
 Source1:        %{name}.desktop
 # backport to QT 4.2
 Patch0:         %{name}-qt42.patch
+Patch1:         %{name}-vector.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
@@ -24,6 +25,7 @@ GUI front-end to the Hercules mainframe 
 %prep
 %setup -q -n HerculesStudio
 %patch0 -p2 -b .qt42
+%patch1 -p1 -b .vector
 
 # remove first line from ui file iff it starts with <?xml ...>
 find . -name \*.ui | xargs sed -i '1{/<?xml/d}'
@@ -60,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 16 2010 Dan Horák <dan[at]danny.cz> - 1.1.0-1
+- update to 1.1.0
+
 * Fri Oct 16 2009 Dan Horák <dan[at]danny.cz> - 1.0.0-1
 - update to 1.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Oct 2009 09:21:47 -0000	1.3
+++ sources	16 Jan 2010 12:25:38 -0000	1.4
@@ -1 +1 @@
-6e144266c2dea07e716049c4ff072d62  herculesstudio-1.0.0-src.tar.gz
+2b7776338aca8d801dd30388c1f5efe3  herculesstudio-1.1.0-src.tar.gz