rpms/hercstudio/F-10 hercstudio-buttons.patch, NONE, 1.1 hercstudio-gcc44.patch, NONE, 1.1 hercstudio.desktop, NONE, 1.1 hercstudio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/hercstudio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7913

Modified Files:
	.cvsignore sources 
Added Files:
	hercstudio-buttons.patch hercstudio-gcc44.patch 
	hercstudio.desktop hercstudio.spec 
Log Message:
initial import

hercstudio-buttons.patch:
 PanelButton.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE hercstudio-buttons.patch ---
Index: HercStudio/PanelButton.cpp
===================================================================
--- HercStudio/PanelButton.cpp	(revision 3)
+++ HercStudio/PanelButton.cpp	(working copy)
@@ -50,7 +50,7 @@
     QPixmap newPix(*filename);
     QPainter painter(this);
     painter.drawPixmap(0, 0, newPix);
-
+    resize(33,25);
 }
 
 void PanelButton::pressedSignal()


hercstudio-gcc44.patch:
 HercConfiguration/devices.cpp     |    1 +
 HercUtilities/UtilityExecutor.cpp |    1 +
 HercUtilities/UtilityRunner.cpp   |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hercstudio-gcc44.patch ---
>From 01d1cb39d38854dbf1c8d5bc7fef4f5230394a9f Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 7 Sep 2009 12:54:33 +0200
Subject: [PATCH] fix build with gcc 4.4

---
 HerculesStudio/HercConfiguration/devices.cpp     |    1 +
 HerculesStudio/HercUtilities/UtilityExecutor.cpp |    1 +
 HerculesStudio/HercUtilities/UtilityRunner.cpp   |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/HerculesStudio/HercConfiguration/devices.cpp b/HerculesStudio/HercConfiguration/devices.cpp
index eb8ebcc..1562720 100644
--- a/HerculesStudio/HercConfiguration/devices.cpp
+++ b/HerculesStudio/HercConfiguration/devices.cpp
@@ -32,6 +32,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <cstdio>
 
 #define NUM_DEVICES 12
 
diff --git a/HerculesStudio/HercUtilities/UtilityExecutor.cpp b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
index bd75b25..0573361 100644
--- a/HerculesStudio/HercUtilities/UtilityExecutor.cpp
+++ b/HerculesStudio/HercUtilities/UtilityExecutor.cpp
@@ -23,6 +23,7 @@
 
 #include "UtilityExecutor.h"
 
+#include <cstdio>
 #include <string.h>
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/HerculesStudio/HercUtilities/UtilityRunner.cpp b/HerculesStudio/HercUtilities/UtilityRunner.cpp
index 95ab2e6..a6d35ae 100644
--- a/HerculesStudio/HercUtilities/UtilityRunner.cpp
+++ b/HerculesStudio/HercUtilities/UtilityRunner.cpp
@@ -27,6 +27,7 @@
 #include "ConfigurationEditor.h"
 
 
+#include <cstdio>
 #include <sstream>
 #include "errno.h"
 
-- 
1.6.3.3



--- NEW FILE hercstudio.desktop ---
[Desktop Entry]
Name=Hercules Studio
Comment=Hercules GUI
Exec=HerculesStudio
Icon=hercstudio
Terminal=false
Type=Application
Categories=System;Emulator;Qt;
Name[en_US]=Hercules Studio



--- NEW FILE hercstudio.spec ---
Name:           hercstudio
Version:        1.0
Release:        0.2.beta%{?dist}
Summary:        GUI front-end to the Hercules mainframe Emulator

Group:          Applications/Emulators
License:        GPLv3+
URL:            http://www.mvsdasd.org/hercstudio/
# sources retrieved from SVN with
# fedora-getsvn hercstudio https://hercstudio.svn.sourceforge.net/svnroot/hercstudio/trunk/HerculesStudio 3
Source0:        %{name}-svn3.tar.bz2
Source1:        %{name}.desktop
Patch0:         %{name}-gcc44.patch
Patch1:         %{name}-buttons.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt4-devel
BuildRequires:  desktop-file-utils
Requires:       hercules >= 3.06-2


%description
GUI front-end to the Hercules mainframe Emulator.


%prep
%setup -q -n %{name}
%patch0 -p2 -b .gcc44
%patch1 -p0 -b .buttons


%build
%{_qt4_qmake}
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps

install -p -m 755 HerculesStudio $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 HercStudio/icons/tray.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hercstudio.xpm

desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/HerculesStudio
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*


%changelog
* Mon Sep  7 2009 Dan Horák <dan[at]danny.cz> - 1.0-0.2.beta
- add patch for panel buttons from upstream

* Mon Sep  7 2009 Dan Horák <dan[at]danny.cz> - 1.0-0.1.beta
- initial Fedora version


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	16 Sep 2009 21:46:02 -0000	1.1
+++ .cvsignore	17 Sep 2009 08:47:43 -0000	1.2
@@ -0,0 +1 @@
+hercstudio-svn3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	16 Sep 2009 21:46:02 -0000	1.1
+++ sources	17 Sep 2009 08:47:44 -0000	1.2
@@ -0,0 +1 @@
+7d0ec93eac96a135df9bbeacafb74a36  hercstudio-svn3.tar.bz2