commit jflex for openSUSE:Factory

11 Sep 2013

Hello community,

here is the log from the commit of package jflex for openSUSE:Factory checked in at 2013-09-11 13:38:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jflex (Old)
 and      /work/SRC/openSUSE:Factory/.jflex.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "jflex"

Changes:
--------

--- /work/SRC/openSUSE:Factory/jflex/jflex-bootstrap.changes	2011-09-23 02:04:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new/jflex-bootstrap.changes	2013-09-11 13:38:37.000000000 +0200
@@ -1,0 +2,22 @@
+Mon Sep  9 11:32:01 UTC 2013 - tchvatal@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+-------------------------------------------------------------------
+Mon Aug 26 12:18:15 UTC 2013 - mvyskocil@suse.com
+
+- don't build tests when bootstrapping 
+- properly synchronized both spec files
+- drop antlr-bootstrap dependency, it's pointless withouth javadoc
+
+-------------------------------------------------------------------
+Fri Aug 23 09:06:21 UTC 2013 - mvyskocil@suse.com
+
+- don't build javadoc 
+
+-------------------------------------------------------------------
+Thu Feb 17 00:59:58 CET 2011 - mvyskocil@suse.cz
+
+- fix build with antlr-bootstrap
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/jflex/jflex.changes	2011-09-23 02:04:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.jflex.new/jflex.changes	2013-09-11 13:38:37.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Sep  9 11:06:00 UTC 2013 - tchvatal@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+-------------------------------------------------------------------
+Mon Aug 26 12:18:15 UTC 2013 - mvyskocil@suse.com
+
+- don't build tests when bootstrapping 
+- properly synchronized both spec files
+- drop antlr-bootstrap dependency, it's pointless withouth javadoc
+
+-------------------------------------------------------------------
+Fri Aug 23 09:06:21 UTC 2013 - mvyskocil@suse.com
+
+- don't build javadoc 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ jflex-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.xUfUW5/_old	2013-09-11 13:38:37.000000000 +0200
+++ /var/tmp/diff_new_pack.xUfUW5/_new	2013-09-11 13:38:37.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package jflex-bootstrap
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@
 # This line is not a comment, please do not remove it!
 #%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name})
 Version:        1.4.3
-Release:        10
+Release:        0
 Summary:        Lexical Analyzer Generator for Java
 License:        GPL-2.0+
 Group:          Development/Libraries/Java
@@ -44,14 +44,14 @@
 Patch3:         jflex-lex-scan.patch
 Patch4:         jflex-byaccj-utl.patch
 Requires:       java_cup
-Requires:       jpackage-utils
+Requires:       javapackages-tools
 BuildRequires:  ant
 BuildRequires:  java-cup-bootstrap
 %if %without bootstrap
 BuildRequires:  jflex-bootstrap
+BuildRequires:  junit
 %endif
 BuildRequires:  java-1_5_0-gcj-compat-devel
-BuildRequires:  junit
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -72,32 +72,9 @@
 
 %if %without bootstrap
 
-%package javadoc
-License:        GPL-2.0+
-Group:          Development/Libraries/Java
-Summary:        Javadoc for %{name}
-
-%description javadoc
-JFlex is a lexical analyzer generator for Java written in Java. It is 
-also a rewrite of the very useful tool JLex which was developed by 
-Elliot Berk at Princeton University. As Vern Paxson states for his C/C++ 
-tool flex: they do not share any code though.
-
-Design goals The main design goals of JFlex are:
-
-    * Full unicode support
-    * Fast generated scanners
-    * Fast scanner generation
-    * Convenient specification syntax
-    * Platform independence
-    * JLex compatibility
-
-This package contains javadoc for %{name}.
-
 %package doc
-License:        GPL-2.0+
-Group:          Development/Libraries/Java
 Summary:        Documentation and examples for %{name}
+Group:          Development/Libraries/Java
 
 %description doc
 JFlex is a lexical analyzer generator for Java written in Java. It is 
@@ -131,9 +108,13 @@
 popd
 %endif
 %patch0 -p1
+
 %if %with bootstrap
 %patch1 -p1
-%else
+
+echo `pwd`
+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
@@ -143,16 +124,13 @@
 %build
 pushd src
 %if %without bootstrap
-export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex)
+export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit jflex antlr-bootstrap)
 %else
-export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit)
+export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit antlr-bootstrap)
 %endif
 export OPT_JAR_LIST=:
-%ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar
-%if %without bootstrap
-%{__mkdir_p} ../dist/docs/api
-%{javadoc} -d ../dist/docs/api `find . -type f -name "*.java"`
-%endif
+echo `pwd`
+%ant jar
 popd
 
 %install
@@ -164,20 +142,9 @@
 # compatibility symlink
 (cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar)
 
-%if %without bootstrap
-# javadoc
-%{__mkdir_p} 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -a dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-%endif
-
 %{__mkdir_p} %{buildroot}%{_bindir}
 %{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex
 
-%clean
-%{__rm} -rf %{buildroot}
-%{__rm} -rf %{_builddir}/jflex
-
 %files
 %defattr(0644,root,root,0755)
 %doc COPYRIGHT src/README src/changelog
@@ -188,11 +155,6 @@
 
 %if %without bootstrap
 
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
-
 %files doc
 %defattr(0644,root,root,0755)
 %doc examples doc

++++++ jflex.spec ++++++
--- /var/tmp/diff_new_pack.xUfUW5/_old	2013-09-11 13:38:37.000000000 +0200
+++ /var/tmp/diff_new_pack.xUfUW5/_new	2013-09-11 13:38:37.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package jflex
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
 # This line is not a comment, please do not remove it!
 #%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name})
 Version:        1.4.3
-Release:        13
+Release:        0
 Summary:        Lexical Analyzer Generator for Java
 License:        GPL-2.0+
 Group:          Development/Libraries/Java
@@ -43,15 +43,14 @@
 Patch3:         jflex-lex-scan.patch
 Patch4:         jflex-byaccj-utl.patch
 Requires:       java_cup
-Requires:       jpackage-utils
+Requires:       javapackages-tools
 BuildRequires:  ant
 BuildRequires:  java-cup-bootstrap
-BuildRequires:  antlr-bootstrap
 %if %without bootstrap
 BuildRequires:  jflex-bootstrap
+BuildRequires:  junit
 %endif
 BuildRequires:  java-1_5_0-gcj-compat-devel
-BuildRequires:  junit
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -72,32 +71,9 @@
 
 %if %without bootstrap
 
-%package javadoc
-License:        GPL-2.0+
-Group:          Development/Libraries/Java
-Summary:        Javadoc for %{name}
-
-%description javadoc
-JFlex is a lexical analyzer generator for Java written in Java. It is 
-also a rewrite of the very useful tool JLex which was developed by 
-Elliot Berk at Princeton University. As Vern Paxson states for his C/C++ 
-tool flex: they do not share any code though.
-
-Design goals The main design goals of JFlex are:
-
-    * Full unicode support
-    * Fast generated scanners
-    * Fast scanner generation
-    * Convenient specification syntax
-    * Platform independence
-    * JLex compatibility
-
-This package contains javadoc for %{name}.
-
 %package doc
-License:        GPL-2.0+
-Group:          Development/Libraries/Java
 Summary:        Documentation and examples for %{name}
+Group:          Development/Libraries/Java
 
 %description doc
 JFlex is a lexical analyzer generator for Java written in Java. It is 
@@ -131,9 +107,13 @@
 popd
 %endif
 %patch0 -p1
+
 %if %with bootstrap
 %patch1 -p1
-%else
+
+echo `pwd`
+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
@@ -148,11 +128,8 @@
 export CLASSPATH=$(build-classpath java-cup java-cup-runtime junit antlr-bootstrap)
 %endif
 export OPT_JAR_LIST=:
+echo `pwd`
 %ant jar
-%if %without bootstrap
-%{__mkdir_p} ../dist/docs/api
-%{javadoc} -d ../dist/docs/api `find . -type f -name "*.java"`
-%endif
 popd
 
 %install
@@ -164,20 +141,9 @@
 # compatibility symlink
 (cd %{buildroot}%{_javadir} && %{__ln_s} jflex.jar JFlex.jar)
 
-%if %without bootstrap
-# javadoc
-%{__mkdir_p} 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -a dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-%endif
-
 %{__mkdir_p} %{buildroot}%{_bindir}
 %{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/jflex
 
-%clean
-%{__rm} -rf %{buildroot}
-%{__rm} -rf %{_builddir}/jflex
-
 %files
 %defattr(0644,root,root,0755)
 %doc COPYRIGHT src/README src/changelog
@@ -188,11 +154,6 @@
 
 %if %without bootstrap
 
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
-
 %files doc
 %defattr(0644,root,root,0755)
 %doc examples doc

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)