rpms/doctorj/FC-4 classpath_fix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 Makefile, 1.2, 1.3 doctorj.spec, 1.11, 1.12 sources, 1.2, 1.3

[Michael J Knox (mjk)]

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6381/FC-4

Modified Files:
	.cvsignore Makefile doctorj.spec sources 
Added Files:
	classpath_fix.patch 
Log Message:
updated sources and patch to export classpath


classpath_fix.patch:

--- NEW FILE classpath_fix.patch ---
--- doctorj-5.0.0/bin/doctorj	2004-06-02 11:55:18.000000000 +1200
+++ doctorj-5.0.0/bin/doctorj.mjk	2006-04-29 14:30:23.000000000 +1200
@@ -21,6 +21,8 @@
    CLASSPATH="${jarfile}"
 fi
 
+export CLASSPATH
+
 DRJ_PROPERTIES="-Ddoctorj.dir=$prefix/share/doctorj $DRJ_PROPERTIES"
 
 java $DRJ_PROPERTIES org.incava.doctorj.Main "$@"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:14:14 -0000	1.2
+++ .cvsignore	29 Apr 2006 02:47:55 -0000	1.3
@@ -1 +1 @@
-doctorj-4.0.2.tar.gz
+doctorj-5.0.0.tar.gz




Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/doctorj.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- doctorj.spec	20 May 2005 20:40:13 -0000	1.11
+++ doctorj.spec	29 Apr 2006 02:47:55 -0000	1.12
@@ -1,57 +1,51 @@
 Name:           doctorj
-Version:        4.0.2
-Release:        7
+Version:        5.0.0
+Release:        2%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
 License:        LGPL
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
-Patch0:         %{name}-improperseq.patch
-Patch1:         %{name}-yagol.patch
-Patch2:         %{name}-precision.patch
+Patch0:		classpath_fix.patch
+Requires:	java-1.4.2-gcj-compat
+BuildRequires:	java-1.4.2-gcj-compat-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flex
-
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
 
-
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
 
 %build
-%configure
-make %{?_smp_mflags}
 
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%check || :
-# make check fails as of 4.0.2...
-
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README
 %{_bindir}/doctorj
 %{_mandir}/man1/doctorj.1*
-
+%{_datadir}/%{name}
 
 %changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
+- added patch to export classpath
+- added requires on java-1.4.2-gcj-compat
+
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
+- Updated version
+
 * Fri May 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 4.0.2-7
 - Patch to fix x86_64 build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:14:14 -0000	1.2
+++ sources	29 Apr 2006 02:47:55 -0000	1.3
@@ -1 +1 @@
-612aac2fd1238fe0246e364e3f884c58  doctorj-4.0.2.tar.gz
+43a11e483ed3524e3709794be5e13267  doctorj-5.0.0.tar.gz