Accepting request 196074 from Java:packages

- don't build javadoc
- use 1.5 source/target

OBS-URL: https://build.opensuse.org/request/show/196074
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jlex?expand=0&rev=16

jlex-1.2.6.build.xml

@@ -53,8 +53,9 @@
            debug="${compile.debug}" 
            deprecation="${compile.deprecation}" 
            optimize="${compile.optimize}" 
-	   source="1.4"
+	   source="1.5"
-	   target="1.4" />
+	   target="1.5" />
+  
 
     </target>
 
@@ -70,7 +71,7 @@
 
 
   <!-- ===================== Distribution Files ========================= -->
-  <target name="dist" depends="package,javadoc">
+  <target name="dist" depends="package">
     <copy todir="${dist.dir}/docs/api">
             <fileset dir="${build.dir}/docs/api"/>
         </copy>

jlex.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 23 09:22:06 UTC 2013 - mvyskocil@suse.com
+
+- don't build javadoc
+- use 1.5 source/target
+
 -------------------------------------------------------------------
 Mon Nov  8 12:10:48 UTC 2010 - mvyskocil@suse.cz
 

jlex.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package jlex (Version 1.2.6)
+# spec file for package jlex
 #
-# Copyright (c) 2010 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
@@ -14,13 +14,13 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
-# norootforbuild
 # icecream 0
 
 
 Name:           jlex
-BuildRequires:  ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap
+BuildRequires:  ant
+BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  xml-commons-apis-bootstrap
 #!BuildIgnore:  xml-commons-apis xml-commons-resolver xml-commons xerces-j2
 #!BuildIgnore:  xml-commons-jaxp-1.3-apis xml-commons-resolver12
 %define name            jlex
@@ -28,7 +28,7 @@ BuildRequires:  ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap
 %define release         2jpp
 %define section		free
 Version:        1.2.6
-Release:        265
+Release:        0
 Summary:        A Lexical Analyzer Generator for Java
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
@@ -42,20 +42,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %description
 JLex is a lexical analyzer generator for Java.
 
-
-
-%package javadoc
-License:        BSD-3-Clause
-PreReq:         coreutils
-Group:          Development/Libraries/Java
-Summary:        Javadoc for jlex
-
-%description javadoc
-JLex is a Lexical Analyzer Generator for Java. This package contains
-the javadoc documentation for JLex.
-
-
-
 %prep
 %setup -c -T
 cp %{SOURCE0} .
@@ -71,19 +57,9 @@ ant
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
 
-%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
-
 %changelog