- build/install fixed.

Changed files:
    classpath.spec -> 1.4

diff --git a/classpath.spec b/classpath.spec
index 9537047aee73c7418b1f7ae967beda92dd37c5ab..2ba477554560f07f103cdbfb7c145bc4bad585b1 100644 (file)
--- a/classpath.spec
+++ b/classpath.spec
@@ -14,7 +14,7 @@ Source0:      ftp://ftp.gnu.org/gnu/classpath/%{name}-%{version}.tar.gz
 URL:           http://www.gnu.org/software/classpath/classpath.html
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.7
-BuildRequires: jikes
+BuildRequires: jikes >= 1.18
 BuildRequires: gdk-pixbuf-devel
 BuildRequires: gtk+2-devel >= 2.2
 BuildRequires: libart_lgpl-devel >= 2.1.0
@@ -38,11 +38,6 @@ g
 %setup -q
 
 %build
-#%%{__gettextize}
-#%%{__aclocal}
-#%%{__autoconf}
-#%%{__autoheader}
-#%%{__automake}
 %configure \
        --with-jikes \
        --enable-java \
@@ -51,23 +46,42 @@ g
        --enable-gtk-peer \
        --enable-load-library \
        --disable-debug
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_javadir}
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+mv -f  $RPM_BUILD_ROOT%{_libdir}{/classpath/*,}
+mv -f  $RPM_BUILD_ROOT%{_datadir}/classpath/glibj.zip \
+       $RPM_BUILD_ROOT%{_javadir}/classpath.jar
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*.so.*.*.*
-%{_libdir}/%{name}/*.la
-%{_libdir}/awt/
-%{_datadir}/%{name}
-# what about?
-# /usr/lib/security/classpath.security ? it conflicts with gcc-java-tools
+%doc AUTHORS ChangeLog NEWS README THANKYOU TODO
+%{_libdir}/libgtkpeer.la
+%attr(755,root,root) %{_libdir}/libgtkpeer.so.*.*.*
+%{_libdir}/libjavaawt.la
+%attr(755,root,root) %{_libdir}/libjavaawt.so.*.*.*
+%{_libdir}/libjavaio.la
+%attr(755,root,root) %{_libdir}/libjavaio.so.*.*.*
+%{_libdir}/libjavalang.la
+%attr(755,root,root) %{_libdir}/libjavalang.so.*.*.*
+%{_libdir}/libjavalangreflect.la
+%attr(755,root,root) %{_libdir}/libjavalangreflect.so.*.*.*
+%{_libdir}/libjavanet.la
+%attr(755,root,root) %{_libdir}/libjavanet.so.*.*.*
+%{_libdir}/libjavanio.la
+%attr(755,root,root) %{_libdir}/libjavanio.so.*.*.*
+%{_libdir}/libjavautil.la
+%attr(755,root,root) %{_libdir}/libjavautil.so.*.*.*
+%{_javadir}/classpath.jar
+%{_infodir}/*