rpms/doctorj/devel doctorj-yagol.patch, NONE, 1.1 doctorj.spec, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	doctorj.spec 
Added Files:
	doctorj-yagol.patch 
Log Message:
Apply proper build fix from Michael Schwendt.

doctorj-yagol.patch:

--- NEW FILE doctorj-yagol.patch ---
diff -Nur doctorj-4.0.2-orig/util/src/Yagol.h doctorj-4.0.2/util/src/Yagol.h
--- doctorj-4.0.2-orig/util/src/Yagol.h	2003-08-21 14:26:30.000000000 +0200
+++ doctorj-4.0.2/util/src/Yagol.h	2005-02-13 11:27:24.483000816 +0100
@@ -298,8 +298,8 @@
     template < class Type >
     string AboveRangeException<Type>::message() const
     {
-        return "value " + doctorj::StringUtilities::toString(value()) + 
-            " is above the upper bound " + doctorj::StringUtilities::toString(limit());
+        return "value " + doctorj::StringUtilities::toString(this->value()) + 
+            " is above the upper bound " + doctorj::StringUtilities::toString(this->limit());
     }
 
 
@@ -339,8 +339,8 @@
     template < class Type >
     string BelowRangeException<Type>::message() const
     {
-        return "value " + doctorj::StringUtilities::toString(value()) + 
-            " is below the lower bound " + doctorj::StringUtilities::toString(limit());
+        return "value " + doctorj::StringUtilities::toString(this->value()) + 
+            " is below the lower bound " + doctorj::StringUtilities::toString(this->limit());
     }
 
 
@@ -1991,7 +1991,7 @@
                                 vector<typename Container::value_type>* const values)
         {
             ArgCallback<vector< typename Container::value_type > >* validator = 
-                new GroupValidator<vector< typename Container::value_type > >(value, valids, nValids);
+                new GroupValidator<vector< typename Container::value_type > >(values, valids, nValids);
             return addOption(new OptionMultiValues<Container>(name, description, validator, strictArgs_));
         }
 


Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- doctorj.spec	13 Feb 2005 09:59:44 -0000	1.6
+++ doctorj.spec	13 Feb 2005 17:07:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        4.0.2
-Release:        3
+Release:        4
 Epoch:          0
 Summary:        Java source code analyzer
 
@@ -9,9 +9,10 @@
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sourceforge.net/doctorj/doctorj-4.0.2.tar.gz
 Patch:          %{name}-improperseq.patch
+Patch1:         %{name}-yagol.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flex compat-gcc-c++
+BuildRequires:  flex
 
 %description
 DoctorJ analyzes Java code, in the following functional areas:
@@ -21,13 +22,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
-# gcc 3.3 doesn't grok -mtune
-%{expand: %%define optflags %(echo %{optflags} | sed s/mtune/mcpu/)}
-export CXX=$(rpm -ql compat-gcc-c++ | grep '^%{_bindir}/g\+\+' | \
-             head -n 1 | xargs basename)
 %configure
 make %{?_smp_mflags}
 
@@ -53,6 +51,9 @@
 
 
 %changelog
+* Sun Feb 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:4.0.2-4
+- Apply proper build fix from Michael Schwendt.
+
 * Sun Feb 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:4.0.2-3
 - Use compat-gcc-c++ to fix build on FC3+.