rpms/qcad/FC-3 qcad-assistant.patch,1.2,1.3 qcad.spec,1.4,1.5

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/qcad/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27331

Modified Files:
	qcad-assistant.patch qcad.spec 
Log Message:
sync with devel tree

* Tue Apr  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4.0-3.fc3
- Add missing line in qcad-assistant.patch which prevents orphans.



qcad-assistant.patch:

Index: qcad-assistant.patch
===================================================================
RCS file: /cvs/extras/rpms/qcad/FC-3/qcad-assistant.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qcad-assistant.patch	20 Feb 2005 23:28:46 -0000	1.2
+++ qcad-assistant.patch	5 Apr 2005 13:45:19 -0000	1.3
@@ -1,6 +1,6 @@
 diff -Nur qcad-2.0.4.0-1.src-orig/qcad/src/qc_applicationwindow.cpp qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.cpp
 --- qcad-2.0.4.0-1.src-orig/qcad/src/qc_applicationwindow.cpp	2004-09-14 22:13:07.000000000 +0200
-+++ qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.cpp	2005-02-15 19:21:39.559936344 +0100
++++ qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.cpp	2005-04-05 15:40:25.000000000 +0200
 @@ -27,6 +27,9 @@
  #include "qc_applicationwindow.h"
  
@@ -11,7 +11,7 @@
  
  #include <qaccel.h>
  #include <qaction.h>
-@@ -2774,11 +2777,40 @@
+@@ -2774,11 +2777,44 @@
  #if QT_VERSION>=0x030200 
          assistant->setArguments(args);
  #endif
@@ -44,9 +44,13 @@
 +		perror( "execvp" );
 +		_exit(1);
 +	    }
++	    int status;
++	    waitpid( pid, &status, 0 );
 +	    _exit(0);
 +	}
 +	// parent
++	int status;
++	waitpid( pid, &status, 0 );
 +    }
 +}
  


Index: qcad.spec
===================================================================
RCS file: /cvs/extras/rpms/qcad/FC-3/qcad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qcad.spec	14 Feb 2005 23:16:46 -0000	1.4
+++ qcad.spec	5 Apr 2005 13:45:19 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		qcad
 Version:	2.0.4.0
-Release:	2
-Summary:	A simple 2D CAD program
+Release:	3.fc3
+Summary:	Simple 2D CAD program
 
 Group:		Applications/Engineering
 License:	GPL
@@ -12,7 +12,7 @@
 Patch2:		qcad-manual-bugs.patch
 URL:		http://www.ribbonsoft.com/qcad.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{subversion}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	qt-devel >= 0:3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
+BuildRequires:	qt-devel >= 3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
 # Help viewer is Qt Assistant in qt-devel package.
 #Requires:       /usr/bin/assistant
 Requires(post): desktop-file-utils
@@ -104,6 +104,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Apr  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4.0-3.fc3
+- Add missing line in qcad-assistant.patch which prevents orphans.
+
 * Mon Feb 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4.0-2
 - Remove /usr/bin/assistant (-> qt-devel) dependency, replace with
   patches to open a warning dialog in case of Qt Assistant error