SPECS: gcc.spec - use any external jar like fastjar

arekm arekm at pld-linux.org
Sat Jan 6 12:43:37 CET 2007


Author: arekm                        Date: Sat Jan  6 11:43:37 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use any external jar like fastjar

---- Files affected:
SPECS:
   gcc.spec (1.455 -> 1.456) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.455 SPECS/gcc.spec:1.456
--- SPECS/gcc.spec:1.455	Fri Jan  5 03:28:42 2007
+++ SPECS/gcc.spec	Sat Jan  6 12:43:31 2007
@@ -571,9 +571,9 @@
 Group:		Development/Languages/Java
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	libgcj-devel = %{epoch}:%{version}-%{release}
+Requires:	jar
 Provides:	gcj = %{epoch}:%{version}-%{release}
 Provides:	gcc-java-tools
-Obsoletes:	fastjar
 Obsoletes:	gcc-java-tools
 
 %description java
@@ -990,6 +990,8 @@
 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
@@ -1362,7 +1364,6 @@
 %attr(755,root,root) %{_bindir}/gjnih
 %attr(755,root,root) %{_bindir}/gkeytool
 %attr(755,root,root) %{_bindir}/grmi*
-%attr(755,root,root) %{_bindir}/jar
 %attr(755,root,root) %{_bindir}/jcf-dump
 %attr(755,root,root) %{_bindir}/jv-*
 %attr(755,root,root) %{_bindir}/*-gcj*
@@ -1505,6 +1506,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.456  2007/01/06 11:43:31  arekm
+- use any external jar like fastjar
+
 Revision 1.455  2007/01/05 02:28:42  sls
 - BR: perl-tools-pod (fastjar needs pod2man)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.455&r2=1.456&f=u



More information about the pld-cvs-commit mailing list