rpms/qcad/devel qcad-manual-bugs.patch,NONE,1.1 qcad.spec,1.2,1.3

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/qcad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3674

Modified Files:
	qcad.spec 
Added Files:
	qcad-manual-bugs.patch 
Log Message:
qcad-assistant.patch

qcad-manual-bugs.patch:

--- NEW FILE qcad-manual-bugs.patch ---
diff -Nur qcad-manual-en-2.0.4.0-1.html-orig/qcaddoc.adp qcad-manual-en-2.0.4.0-1.html/qcaddoc.adp
--- qcad-manual-en-2.0.4.0-1.html-orig/qcaddoc.adp	2004-09-12 00:51:05.000000000 +0200
+++ qcad-manual-en-2.0.4.0-1.html/qcaddoc.adp	2005-02-14 20:08:22.649667144 +0100
@@ -4,8 +4,6 @@
 
     <property name="title">QCad Manual</property>
 
-    <property name="applicationicon">cad/imgs/qcadicon.png</property>
-
     <property name="startpage">cad/index.html</property>
 
     <property name="aboutmenutext">About QCad Manual</property>
@@ -15,7 +13,7 @@
     <property name="assistantdocs">.</property>
   </profile>
 
-  <DCF ref="cad/index.html" icon="cad/imgs/manual.png" title="QCad Manual">
+  <DCF ref="cad/index.html" title="QCad Manual">
     <section ref="cad/index.html" title="Home">
     </section>
 


Index: qcad.spec
===================================================================
RCS file: /cvs/extras/rpms/qcad/devel/qcad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qcad.spec	13 Feb 2005 20:36:14 -0000	1.2
+++ qcad.spec	14 Feb 2005 22:37:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		qcad
 Version:	2.0.4.0
-Release:	1
+Release:	2
 Summary:	A simple 2D CAD program
 
 Group:		Applications/Engineering
@@ -8,10 +8,13 @@
 Source:		http://www.ribbonsoft.com/archives/qcad/qcad-2.0.4.0-1.src.tar.gz
 Source1:	http://www.ribbonsoft.com/archives/qcad/qcad-manual-en-2.0.4.0-1.html.zip
 Patch:		qcad-qass.patch
+Patch1:		qcad-assistant.patch
+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
-Requires:       /usr/bin/assistant
+# Help viewer is Qt Assistant in qt-devel package.
+#Requires:       /usr/bin/assistant
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -26,6 +29,8 @@
 %setup -q -n %{name}-%{version}-1.src
 %setup -q -T -D -a 1 -n %{name}-%{version}-1.src
 %patch -p1
+%patch1 -p1 -b .assistanterror
+%patch2 -p0 -b .manual
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -98,6 +103,12 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* 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
+  conditions. Add a related patch for the English manual which
+  removes references to two missing images.
+
 * Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.0.4.0-1
 - Added documentation
 - Fixed code for calling Qt Assistant: qcad-qass.patch