rpms/qucs/FC-3 qucs-0.0.7-2.diff, NONE, 1.1 qucs-0.0.7-config.diff, NONE, 1.1 qucs.spec, 1.1, 1.2

[Eric Tanguy (tanguy)]

Author: tanguy

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

Modified Files:
	qucs.spec 
Added Files:
	qucs-0.0.7-2.diff qucs-0.0.7-config.diff 
Log Message:
auto-import qucs-0.0.7-7 on branch FC-3 from qucs-0.0.7-7.src.rpm

qucs-0.0.7-2.diff:

--- NEW FILE qucs-0.0.7-2.diff ---
diff -ur qucs-0.0.7-orig/qucs/qucsview.cpp qucs-0.0.7/qucs/qucsview.cpp
--- qucs-0.0.7-orig/qucs/qucsview.cpp	Thu Jul 21 21:23:19 2005
+++ qucs-0.0.7/qucs/qucsview.cpp	Fri Aug 26 19:21:33 2005
@@ -539,7 +539,7 @@
       else {  if(long(pw->Port1) & 1) { pw->x1 += MAx1; }
               if(long(pw->Port1) & 2) { pw->y1 += MAy1; } }
 
-      if(int(pw->Port2) > 3) { pw->x2 += MAx1;  pw->y2 += MAy1; }
+      if(((unsigned long)pw->Port2) > 3) { pw->x2 += MAx1;  pw->y2 += MAy1; }
       else {  if(long(pw->Port2) & 1) pw->x2 += MAx1;
               if(long(pw->Port2) & 2) pw->y2 += MAy1; }
 
@@ -725,7 +725,7 @@
       else {  if(long(pw->Port1) & 1) { pw->x1 += MAx1; }
               if(long(pw->Port1) & 2) { pw->y1 += MAy1; } }
 
-      if(int(pw->Port2) > 3) { pw->x2 += MAx1;  pw->y2 += MAy1; }
+      if(((unsigned long)pw->Port2) > 3) { pw->x2 += MAx1;  pw->y2 += MAy1; }
       else {  if(long(pw->Port2) & 1) pw->x2 += MAx1;
               if(long(pw->Port2) & 2) pw->y2 += MAy1; }
 

qucs-0.0.7-config.diff:

--- NEW FILE qucs-0.0.7-config.diff ---
--- qucs-0.0.7.orig/configure.ac	2005-07-21 23:11:22.000000000 +0200
+++ qucs-0.0.7/configure.ac	2005-10-18 09:37:56.000000000 +0200
@@ -37,8 +37,8 @@
   QT_DEF=""
 else
   AC_DEFINE(NDEBUG, 1, [Define if debug code should be suppressed.])
-  CFLAGS="-O2"
-  CXXFLAGS="-O2"
+#  CFLAGS="-O2"
+#  CXXFLAGS="-O2"
   QT_DEF="-DQT_NO_DEBUG"
 fi
 unset enable_debug
--- qucs-0.0.7.orig/configure	2005-07-21 23:19:03.000000000 +0200
+++ qucs-0.0.7/configure	2005-10-18 09:38:23.000000000 +0200
@@ -3547,8 +3547,8 @@
 #define NDEBUG 1
 _ACEOF
 
-  CFLAGS="-O2"
-  CXXFLAGS="-O2"
+#  CFLAGS="-O2"
+#  CXXFLAGS="-O2"
   QT_DEF="-DQT_NO_DEBUG"
 fi
 unset enable_debug


Index: qucs.spec
===================================================================
RCS file: /cvs/extras/rpms/qucs/FC-3/qucs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qucs.spec	16 Oct 2005 10:26:36 -0000	1.1
+++ qucs.spec	19 Oct 2005 16:34:07 -0000	1.2
@@ -1,11 +1,11 @@
-#
-
 Summary:	Circuit simulator
 Name: 		qucs
 Version:	0.0.7
-Release: 	5%{?dist}
+Release: 	7%{?dist}
 Source0:	http://ovh.dl.sourceforge.net/sourceforge/qucs/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
+Patch0:		qucs-0.0.7-config.diff
+Patch1:		qucs-0.0.7-2.diff
 URL:		http://qucs.sourceforge.net/
 License:	GPL 
 Group: 		Applications/Engineering
@@ -22,6 +22,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -52,6 +54,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 19 2005 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.7-7
+- Add qucs-0.0.7-2.diff for the x86_64 target
+
+* Tue Oct 18 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.0.7-6
+- Add qucs-0.0.7-config.diff to make configure script aware of RPM_OPT_FLAGS.
+
 * Tue Oct 11 2005 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 0.0.7-5
 -add qucs.desktop
 -modify buildroot