Accepting request 125127 from Java:packages

- disable javadoc (workaround for jdk7 build)

OBS-URL: https://build.opensuse.org/request/show/125127
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jtidy?expand=0&rev=10

jtidy.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 15 13:39:06 UTC 2012 - mvyskocil@suse.cz
+
+- disable javadoc (workaround for jdk7 build) 
+
 -------------------------------------------------------------------
 Wed May 20 11:31:39 CEST 2009 - mvyskocil@suse.cz
 

jtidy.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package jtidy (Version 8.0)
+# spec file for package jtidy
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -26,7 +26,7 @@
 
 Name:           jtidy
 Version:        8.0
-Release:        3
+Release:        0
 Summary:        HTML syntax checker and pretty printer
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
@@ -57,25 +57,24 @@ DOM parser for real-world HTML.
 
 
 
-%package javadoc
+# % package javadoc
-License:        BSD-3-Clause
+#License:        BSD-3-Clause
-Group:          Development/Libraries/Java
+#Group:          Development/Libraries/Java
-Summary:        HTML syntax checker and pretty printer
+#Summary:        HTML syntax checker and pretty printer
-
+#
-%description javadoc
+# % description javadoc
-JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty
+#JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty
-printer. Like its non-Java cousin, JTidy can be used as a tool for
+#printer. Like its non-Java cousin, JTidy can be used as a tool for
-cleaning up malformed and faulty HTML. In addition, JTidy provides a
+#cleaning up malformed and faulty HTML. In addition, JTidy provides a
-DOM parser for real-world HTML.
+#DOM parser for real-world HTML.
 
 
 
 %package scripts
-License:        BSD-3-Clause
 Summary:        HTML syntax checker and pretty printer
 Group:          Development/Libraries/Java
-Requires:       jpackage-utils >= 1.5
 Requires:       %{name} = %{version}
+Requires:       jpackage-utils >= 1.5
 
 %description scripts
 JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty
@@ -89,6 +88,8 @@ DOM parser for real-world HTML.
 %setup -q -n %{name}
 %{__cp} -p %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 
+sed -i 's/charset="ISO-8859-1"/charset="UTF-8"/' maven-build.xml
+
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
@@ -101,21 +102,23 @@ export OPT_JAR_LIST="junit ant/ant-junit"
     -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
     -Dmaven.test.skip=true \
     -Dmaven.test.error.ignore=true \
-    package javadoc
+    package
+# javadoc
 
 %install
+
 # jar
 %__mkdir_p %{buildroot}%{_javadir}
-%__cp -a target/jtidy-8.0-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+%__cp -a target/jtidy-8.0-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
-# jar versioning
+
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %__ln_s ${jar} `echo $jar| %__sed "s|-%{version}||g"`; done)
 # javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
+# % __mkdir_p %{buildroot}%{_javadocdir}/%{name}
-%__cp -a target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+# % __cp -a target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+
 # shell script
 %__mkdir_p %{buildroot}%{_bindir}
 %__install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+
 # ant.d
 %__mkdir_p %{buildroot}%{_sysconfdir}/ant.d
 %__cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
@@ -129,20 +132,14 @@ EOF
 %defattr(0644,root,root,0755)
 %doc LICENSE.txt
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
 %config(noreplace) %{_sysconfdir}/ant.d/%{name}
 
-%files javadoc
+# % files javadoc
-%defattr(0644,root,root,0755)
+# % defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+# % doc %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}
 
 %files scripts
 %defattr(0755,root,root,0755)
 %{_bindir}/*
 
 %changelog
-* Wed May 20 2009 mvyskocil@suse.cz
-- 'fixed bnc#501764: removed clover.license from source tarball'
-* Thu May 07 2009 mvyskocil@suse.cz
-- Initial packaging of 8.0 in SUSE (from jpp 5.0)