forked from pool/jflex
Accepting request 531061 from Java:packages
Don't depend on java-gcj-compat OBS-URL: https://build.opensuse.org/request/show/531061 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jflex?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
97b229ddf5
@ -1,7 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 2 12:44:30 UTC 2013 - mvyskocil@suse.com
|
||||
Wed Oct 4 07:49:17 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- conflicts with non-bootstrap variant
|
||||
- Removed a jflex-lex-scan.patch again, so that bot is happy
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 3 17:31:18 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Don't BuildRequire java-1_5_0-gcj-compat-devel, since it will be
|
||||
soon gone; BuildRequire java-devel
|
||||
- Build with java source and target level 1.6 to allow building
|
||||
with jdk9
|
||||
- Sync the bootstrap and non-bootstrap spec files using the
|
||||
jpackage-bootstrap-prepare.sh script and clean spec file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 2 12:44:19 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- conflict the non-bootstrap variant with the bootstrap variant
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 14 12:31:24 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package jflex-bootstrap
|
||||
#
|
||||
# Copyright (c) 2013 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
|
||||
@ -20,13 +20,9 @@
|
||||
%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
|
||||
%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
|
||||
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
|
||||
|
||||
##### WARNING: please do not edit this auto generated spec file. Use the jflex.spec! #####
|
||||
%define with_bootstrap 1
|
||||
%bcond_with bootstrap
|
||||
|
||||
%define section free
|
||||
|
||||
Name: jflex-bootstrap
|
||||
# This line is not a comment, please do not remove it!
|
||||
#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name})
|
||||
@ -38,22 +34,26 @@ Group: Development/Libraries/Java
|
||||
Url: http://www.jflex.de/
|
||||
Source0: http://www.jflex.de/jflex-%{version}.tar.bz2
|
||||
Source1: jflex.script
|
||||
Source100: jpackage-bootstrap-prepare.sh
|
||||
Patch0: jflex-javac-no-target.patch
|
||||
Patch1: jflex-no-cup-no-jflex.patch
|
||||
Patch2: jflex-classpath.patch
|
||||
Patch3: jflex-lex-scan.patch
|
||||
Patch4: jflex-byaccj-utl.patch
|
||||
Requires: java_cup
|
||||
Requires: javapackages-tools
|
||||
#PATCH-FIX-OPENSUSE: make AllTests.main empty, code was not compatible with junit 4
|
||||
Patch5: jflex-junit4.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-cup-bootstrap
|
||||
BuildRequires: java-devel
|
||||
Requires: java_cup
|
||||
Requires: javapackages-tools
|
||||
BuildArch: noarch
|
||||
%if %without bootstrap
|
||||
BuildRequires: jflex-bootstrap
|
||||
BuildRequires: junit
|
||||
Conflicts: jflex-bootstrap
|
||||
%else
|
||||
Conflicts: jflex
|
||||
%endif
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
JFlex is a lexical analyzer generator for Java written in Java. It is
|
||||
@ -71,7 +71,6 @@ Design goals The main design goals of JFlex are:
|
||||
* JLex compatibility
|
||||
|
||||
%if %without bootstrap
|
||||
|
||||
%package doc
|
||||
Summary: Documentation and examples for %{name}
|
||||
Group: Development/Libraries/Java
|
||||
@ -96,15 +95,15 @@ This package contains documentation and examples for %{name}
|
||||
|
||||
%prep
|
||||
%setup -q -n jflex-%{version}
|
||||
%{__perl} -pi -e 's/\r$//g' examples/standalone/sample.inp
|
||||
%{__rm} -rf src/java_cup
|
||||
find . -name '*.jar' | xargs -t %{__rm}
|
||||
perl -pi -e 's/\r$//g' examples/standalone/sample.inp
|
||||
rm -rf src/java_cup
|
||||
find . -name '*.jar' | xargs -t rm
|
||||
%if %without bootstrap
|
||||
export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex)
|
||||
export OPT_JAR_LIST=:
|
||||
pushd src
|
||||
%ant realclean
|
||||
%ant jflex
|
||||
%{ant} realclean
|
||||
%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jflex
|
||||
popd
|
||||
%endif
|
||||
%patch0 -p1
|
||||
@ -117,8 +116,8 @@ rm -rf src/JFlex/tests
|
||||
%else # with bootstrap
|
||||
# You must use Re jflex.spec and have a java-cup and jflex installed
|
||||
%patch2 -p1
|
||||
#%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -130,23 +129,22 @@ export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit antlr-bootstr
|
||||
%endif
|
||||
export OPT_JAR_LIST=:
|
||||
echo `pwd`
|
||||
%ant jar
|
||||
%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar
|
||||
popd
|
||||
|
||||
%install
|
||||
# jar
|
||||
%{__mkdir_p} %{buildroot}%{_javadir}
|
||||
%{__cp} -a lib/JFlex.jar %{buildroot}%{_javadir}/jflex-%{version}.jar
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
mkdir -p %{buildroot}%{_javadir}
|
||||
cp -a lib/JFlex.jar %{buildroot}%{_javadir}/jflex-%{version}.jar
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
|
||||
# compatibility symlink
|
||||
(cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar)
|
||||
(cd %{buildroot}%{_javadir} && ln -s jflex.jar JFlex.jar)
|
||||
|
||||
%{__mkdir_p} %{buildroot}%{_bindir}
|
||||
%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc COPYRIGHT src/README src/changelog
|
||||
%attr(0755,root,root) %{_bindir}/jflex
|
||||
%{_javadir}/jflex.jar
|
||||
@ -154,9 +152,7 @@ popd
|
||||
%{_javadir}/JFlex.jar
|
||||
|
||||
%if %without bootstrap
|
||||
|
||||
%files doc
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc examples doc
|
||||
%endif
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- jflex-1.4.3/src/JFlex/LexScan.java
|
||||
+++ jflex-1.4.3/src/JFlex/LexScan.java
|
||||
@@ -1642,9 +1642,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
- /** denotes if the user-EOF-code has already been executed */
|
||||
- private boolean zzEOFDone;
|
||||
-
|
||||
/* user code: */
|
||||
int balance = 0;
|
||||
int commentbalance = 0;
|
||||
@ -1,7 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 4 07:49:17 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Removed a jflex-lex-scan.patch again, so that bot is happy
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 3 17:31:18 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Don't BuildRequire java-1_5_0-gcj-compat-devel, since it will be
|
||||
soon gone; BuildRequire java-devel
|
||||
- Build with java source and target level 1.6 to allow building
|
||||
with jdk9
|
||||
- Sync the bootstrap and non-bootstrap spec files using the
|
||||
jpackage-bootstrap-prepare.sh script and clean spec file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 2 12:44:19 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- conflicts with bootstrap variant
|
||||
- conflict the non-bootstrap variant with the bootstrap variant
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 14 12:31:24 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
48
jflex.spec
48
jflex.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package jflex
|
||||
#
|
||||
# Copyright (c) 2013 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
|
||||
@ -20,12 +20,8 @@
|
||||
%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
|
||||
%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
|
||||
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
|
||||
|
||||
%define _without_bootstrap 1
|
||||
%bcond_with bootstrap
|
||||
|
||||
%define section free
|
||||
|
||||
Name: jflex
|
||||
# This line is not a comment, please do not remove it!
|
||||
#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name})
|
||||
@ -37,17 +33,19 @@ Group: Development/Libraries/Java
|
||||
Url: http://www.jflex.de/
|
||||
Source0: http://www.jflex.de/jflex-%{version}.tar.bz2
|
||||
Source1: jflex.script
|
||||
Source100: jpackage-bootstrap-prepare.sh
|
||||
Patch0: jflex-javac-no-target.patch
|
||||
Patch1: jflex-no-cup-no-jflex.patch
|
||||
Patch2: jflex-classpath.patch
|
||||
Patch3: jflex-lex-scan.patch
|
||||
Patch4: jflex-byaccj-utl.patch
|
||||
#PATCH-FIX-OPENSUSE: make AllTests.main empty, code was not compatible with junit 4
|
||||
Patch5: jflex-junit4.patch
|
||||
Requires: java_cup
|
||||
Requires: javapackages-tools
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-cup-bootstrap
|
||||
BuildRequires: java-devel
|
||||
Requires: java_cup
|
||||
Requires: javapackages-tools
|
||||
BuildArch: noarch
|
||||
%if %without bootstrap
|
||||
BuildRequires: jflex-bootstrap
|
||||
BuildRequires: junit
|
||||
@ -55,9 +53,6 @@ Conflicts: jflex-bootstrap
|
||||
%else
|
||||
Conflicts: jflex
|
||||
%endif
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
JFlex is a lexical analyzer generator for Java written in Java. It is
|
||||
@ -75,7 +70,6 @@ Design goals The main design goals of JFlex are:
|
||||
* JLex compatibility
|
||||
|
||||
%if %without bootstrap
|
||||
|
||||
%package doc
|
||||
Summary: Documentation and examples for %{name}
|
||||
Group: Development/Libraries/Java
|
||||
@ -100,15 +94,15 @@ This package contains documentation and examples for %{name}
|
||||
|
||||
%prep
|
||||
%setup -q -n jflex-%{version}
|
||||
%{__perl} -pi -e 's/\r$//g' examples/standalone/sample.inp
|
||||
%{__rm} -rf src/java_cup
|
||||
find . -name '*.jar' | xargs -t %{__rm}
|
||||
perl -pi -e 's/\r$//g' examples/standalone/sample.inp
|
||||
rm -rf src/java_cup
|
||||
find . -name '*.jar' | xargs -t rm
|
||||
%if %without bootstrap
|
||||
export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex)
|
||||
export OPT_JAR_LIST=:
|
||||
pushd src
|
||||
%ant realclean
|
||||
%ant jflex
|
||||
%{ant} realclean
|
||||
%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jflex
|
||||
popd
|
||||
%endif
|
||||
%patch0 -p1
|
||||
@ -121,10 +115,9 @@ rm -rf src/JFlex/tests
|
||||
%else # with bootstrap
|
||||
# You must use Re jflex.spec and have a java-cup and jflex installed
|
||||
%patch2 -p1
|
||||
#%patch3 -p1
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%patch5 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
pushd src
|
||||
@ -135,23 +128,22 @@ export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit antlr-bootstr
|
||||
%endif
|
||||
export OPT_JAR_LIST=:
|
||||
echo `pwd`
|
||||
%ant jar
|
||||
%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar
|
||||
popd
|
||||
|
||||
%install
|
||||
# jar
|
||||
%{__mkdir_p} %{buildroot}%{_javadir}
|
||||
%{__cp} -a lib/JFlex.jar %{buildroot}%{_javadir}/jflex-%{version}.jar
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
mkdir -p %{buildroot}%{_javadir}
|
||||
cp -a lib/JFlex.jar %{buildroot}%{_javadir}/jflex-%{version}.jar
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
|
||||
# compatibility symlink
|
||||
(cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar)
|
||||
(cd %{buildroot}%{_javadir} && ln -s jflex.jar JFlex.jar)
|
||||
|
||||
%{__mkdir_p} %{buildroot}%{_bindir}
|
||||
%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc COPYRIGHT src/README src/changelog
|
||||
%attr(0755,root,root) %{_bindir}/jflex
|
||||
%{_javadir}/jflex.jar
|
||||
@ -159,9 +151,7 @@ popd
|
||||
%{_javadir}/JFlex.jar
|
||||
|
||||
%if %without bootstrap
|
||||
|
||||
%files doc
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc examples doc
|
||||
%endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user