From c81957d37090d14c287478194bebc57d2262bd8cbea7fcd7920038066d18081d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 30 Oct 2017 08:51:27 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jikes?expand=0&rev=6 --- jikes.changes | 7 +++++++ jikes.spec | 54 ++++++++++++++++++--------------------------------- 2 files changed, 26 insertions(+), 35 deletions(-) diff --git a/jikes.changes b/jikes.changes index c350835..62843dc 100644 --- a/jikes.changes +++ b/jikes.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 30 08:50:22 UTC 2017 - fstrba@suse.com + +- With removal of java-1_5_0-gcj-compat, jikes became uninstallable + * Require: jre1.1.x -> jre >= 1.1 +- Spec cleaner + ------------------------------------------------------------------- Wed Dec 21 10:31:39 UTC 2011 - coolo@suse.com diff --git a/jikes.spec b/jikes.spec index 864e887..720031e 100644 --- a/jikes.spec +++ b/jikes.spec @@ -1,7 +1,7 @@ # # spec file for package jikes # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,18 @@ Name: jikes -BuildRequires: automake -BuildRequires: gcc-c++ -Requires: jre1.1.x Version: 1.22 Release: 0 +Summary: IBM Java Compiler +License: IPL-1.0 +Group: Development/Languages/Java Url: http://jikes.sourceforge.net/ Source0: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-uninitialized-variables.patch Patch1: %{name}-%{version}-strict_aliasing.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: IBM Java Compiler -License: IPL-1.0 -Group: Development/Languages/Java +BuildRequires: automake +BuildRequires: gcc-c++ +Requires: jre >= 1.1 %description Jikes(TM) is a compiler that translates Java(TM) source files as @@ -60,16 +59,6 @@ that make it a valuable contribution to the Java community: Note that you must set CLASSPATH correctly to use jikes. - - -Authors: --------- - Philippe Charles - Ken Coar - Michael Ernst - Dave Shields - Vadim Zaliva - %prep %setup -q %patch0 @@ -78,28 +67,23 @@ cp -v doc/license.htm license.html %build autoreconf -I src/m4 --force --install -CFLAGS="$RPM_OPT_FLAGS" \ -CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --infodir=%{_infodir} \ - --sysconfdir=%{_sysconfdir} -make %{?jobs:-j%jobs} +CFLAGS="%{optflags}" \ +CXXFLAGS="%{optflags}" \ +%configure --mandir=%{_mandir} \ + --prefix=%{_prefix} \ + --infodir=%{_infodir} \ + --sysconfdir=%{_sysconfdir} +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install # -rm $RPM_BUILD_ROOT/%{_datadir}/doc/%name-%version/license.htm - -%clean -rm -rf $RPM_BUILD_ROOT +rm %{buildroot}/%{_datadir}/doc/%{name}-%{version}/license.htm %files -%defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO doc/license.htm -%{_mandir}/man1/jikes.1.gz -%{_prefix}/include/* +%doc AUTHORS COPYING ChangeLog NEWS README TODO doc/license.htm +%{_mandir}/man1/jikes.1%{ext_man} +%{_includedir}/* %{_bindir}/jikes %changelog