From 719cb3d5a6ed19eee8d497c9a49798cc705fd9a1632a0a65681579406fbed8a1 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 23 Aug 2013 08:09:35 +0000 Subject: [PATCH] - Disable build of javadoc * drop java-cup-javadoc.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/java-cup?expand=0&rev=9 --- java-cup-bootstrap.spec | 36 +----------------------------------- java-cup-javadoc.patch | 16 ---------------- java-cup.changes | 6 ++++++ java-cup.spec | 35 ----------------------------------- 4 files changed, 7 insertions(+), 86 deletions(-) delete mode 100644 java-cup-javadoc.patch diff --git a/java-cup-bootstrap.spec b/java-cup-bootstrap.spec index 64f9e72..3241af5 100644 --- a/java-cup-bootstrap.spec +++ b/java-cup-bootstrap.spec @@ -43,7 +43,6 @@ Source2: java-cup-generated-files.tar.bz2 # From http://www2.cs.tum.edu/projects/cup/ Source3: java-cup.license Source1000: jpackage-bootstrap-prepare.sh -Patch0: java-cup-javadoc.patch Patch1: java-cup-no-classpath-in-manifest.patch Patch2: java-cup-no-cup-no-jflex.patch Patch3: java-cup-classpath.patch @@ -82,26 +81,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * %if %without bootstrap -%package javadoc -Summary: LALR Parser Generator in Java -Group: Development/Libraries/Java - -%description javadoc -java-cup is a LALR Parser Generator in Java. With v0.11, you can: * - use CUP in an Ant-Target - -* start CUP by a simple command like java -jar java-cup-11a.jar - myGrammar.cup - -* use generic parametrized classes (since Java 1.5) as datatypes for - non - -* terminals and terminals - -* have Your own symbol classes - - - %package manual Summary: LALR Parser Generator in Java Group: Development/Libraries/Java @@ -126,7 +105,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * %prep %setup -q -n develop -%patch0 -p1 %patch1 -p1 %if %with bootstrap %setup -q -T -D -a 2 -n develop @@ -148,9 +126,6 @@ export CLASSPATH=$(build-classpath java-cup jflex) %endif export OPT_JAR_LIST=: %ant -%if %without bootstrap -%ant javadoc -%endif %install # jar @@ -160,12 +135,7 @@ export OPT_JAR_LIST=: (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done) # compatibility symlinks (cd %{buildroot}%{_javadir} && %{__ln_s} %{real_name}.jar java_cup.jar && %{__ln_s} %{real_name}-runtime.jar java_cup-runtime.jar) -%if %without bootstrap -# javadoc -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -a dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %{__ln_s} %{name}-%{version} %{name}) -%endif + %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name} @@ -183,10 +153,6 @@ export OPT_JAR_LIST=: %defattr(0644,root,root,0755) %doc manual.html -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} %endif %changelog diff --git a/java-cup-javadoc.patch b/java-cup-javadoc.patch deleted file mode 100644 index 16f143d..0000000 --- a/java-cup-javadoc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- develop/build.xml.orig 2006-09-09 06:16:46.000000000 +0200 -+++ develop/build.xml 2006-09-09 06:18:30.000000000 +0200 -@@ -74,6 +74,13 @@ - - - -+ - -+ -+ -+ -+ -+ -+ - - diff --git a/java-cup.changes b/java-cup.changes index 485606b..626b805 100644 --- a/java-cup.changes +++ b/java-cup.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 23 08:06:54 UTC 2013 - mvyskocil@suse.com + +- Disable build of javadoc + * drop java-cup-javadoc.patch + ------------------------------------------------------------------- Mon Jun 4 13:08:48 UTC 2012 - cfarrell@suse.com diff --git a/java-cup.spec b/java-cup.spec index f7ecb4a..6432646 100644 --- a/java-cup.spec +++ b/java-cup.spec @@ -42,7 +42,6 @@ Source2: java-cup-generated-files.tar.bz2 # From http://www2.cs.tum.edu/projects/cup/ Source3: java-cup.license Source1000: jpackage-bootstrap-prepare.sh -Patch0: java-cup-javadoc.patch Patch1: java-cup-no-classpath-in-manifest.patch Patch2: java-cup-no-cup-no-jflex.patch Patch3: java-cup-classpath.patch @@ -79,26 +78,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * %if %without bootstrap -%package javadoc -Summary: LALR Parser Generator in Java -Group: Development/Libraries/Java - -%description javadoc -java-cup is a LALR Parser Generator in Java. With v0.11, you can: * - use CUP in an Ant-Target - -* start CUP by a simple command like java -jar java-cup-11a.jar - myGrammar.cup - -* use generic parametrized classes (since Java 1.5) as datatypes for - non - -* terminals and terminals - -* have Your own symbol classes - - - %package manual Summary: LALR Parser Generator in Java Group: Development/Libraries/Java @@ -123,7 +102,6 @@ java-cup is a LALR Parser Generator in Java. With v0.11, you can: * %prep %setup -q -n develop -%patch0 -p1 %patch1 -p1 %if %with bootstrap %setup -q -T -D -a 2 -n develop @@ -145,9 +123,6 @@ export CLASSPATH=$(build-classpath java-cup jflex) %endif export OPT_JAR_LIST=: %ant -%if %without bootstrap -%ant javadoc -%endif %install # jar @@ -157,12 +132,6 @@ export OPT_JAR_LIST=: (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done) # compatibility symlinks (cd %{buildroot}%{_javadir} && %{__ln_s} %{real_name}.jar java_cup.jar && %{__ln_s} %{real_name}-runtime.jar java_cup-runtime.jar) -%if %without bootstrap -# javadoc -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} -%{__cp} -a dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %{__ln_s} %{name}-%{version} %{name}) -%endif %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/%{real_name} @@ -180,10 +149,6 @@ export OPT_JAR_LIST=: %defattr(0644,root,root,0755) %doc manual.html -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} %endif %changelog