SPECS: gcc.spec - don't require external jar, we have gjar now in gcc-java....

[pluto]

Author: pluto                        Date: Fri Jun 20 08:53:43 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't require external jar, we have gjar now in gcc-java.
- fix internal jar wrapper build.

---- Files affected:
SPECS:
   gcc.spec (1.543 -> 1.544) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.543 SPECS/gcc.spec:1.544
--- SPECS/gcc.spec:1.543	Thu Jun 19 20:29:11 2008
+++ SPECS/gcc.spec	Fri Jun 20 10:53:38 2008
@@ -924,7 +924,6 @@
 Summary(pl.UTF-8):	Obsługa Javy dla gcc
 Group:		Development/Languages/Java
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	jar
 Requires:	libgcj-devel = %{epoch}:%{version}-%{release}
 Provides:	gcc-java-tools
 Provides:	gcj = %{epoch}:%{version}-%{release}
@@ -1337,7 +1336,8 @@
 rm -rf builddir && install -d builddir && cd builddir
 
 # http://www.mailinglistarchive.com/java%40gcc.gnu.org/msg02751.html
-JAR=no \
+export JAR=no
+
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags}" \
 CXXFLAGS="%{rpmcxxflags}" \
@@ -1502,8 +1502,6 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/classpath/libgjs*.la
 # tools.zip sources
 rm -rf $RPM_BUILD_ROOT%{_datadir}/classpath/tools/gnu
-# we will use Requires: jar for now
-rm -f $RPM_BUILD_ROOT%{_bindir}/jar
 %endif
 %if %{with objc}
 cp -f libobjc/README gcc/objc/README.libobjc
@@ -2145,6 +2143,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.544  2008/06/20 08:53:38  pluto
+- don't require external jar, we have gjar now in gcc-java.
+- fix internal jar wrapper build.
+
 Revision 1.543  2008/06/19 18:29:11  pluto
 - testing alternative solution to avoid BC:jar...
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gcc.spec?r1=1.543&r2=1.544&f=u