Mailinglist Archive: opensuse-commit (1446 mails)

< Previous Next >
commit jtidy for openSUSE:Factory
Hello community,

here is the log from the commit of package jtidy for openSUSE:Factory checked
in at 2012-06-16 06:55:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jtidy (Old)
and /work/SRC/openSUSE:Factory/.jtidy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "jtidy", Maintainer is "bnc-team-java@xxxxxxxxxxxxxxxxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/jtidy/jtidy.changes 2011-09-23
02:04:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.jtidy.new/jtidy.changes 2012-06-16
06:55:53.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 15 13:39:06 UTC 2012 - mvyskocil@xxxxxxx
+
+- disable javadoc (workaround for jdk7 build)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ jtidy.spec ++++++
--- /var/tmp/diff_new_pack.hH1hIo/_old 2012-06-16 06:55:55.000000000 +0200
+++ /var/tmp/diff_new_pack.hH1hIo/_new 2012-06-16 06:55:55.000000000 +0200
@@ -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 @@



-%package javadoc
-License: BSD-3-Clause
-Group: Development/Libraries/Java
-Summary: HTML syntax checker and pretty printer
-
-%description javadoc
-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
-cleaning up malformed and faulty HTML. In addition, JTidy provides a
-DOM parser for real-world HTML.
+# % package javadoc
+#License: BSD-3-Clause
+#Group: Development/Libraries/Java
+#Summary: HTML syntax checker and pretty printer
+#
+# % description javadoc
+#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
+#cleaning up malformed and faulty HTML. In addition, JTidy provides a
+#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 @@
%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 @@
-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
-# jar versioning
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %__ln_s ${jar}
`echo $jar| %__sed "s|-%{version}||g"`; done)
+%__cp -a target/jtidy-8.0-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
+
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -a target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+# % __mkdir_p %{buildroot}%{_javadocdir}/%{name}
+# % __cp -a target/site/apidocs/* %{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,13 +132,11 @@
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
%config(noreplace) %{_sysconfdir}/ant.d/%{name}

-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+# % files javadoc
+# % defattr(0644,root,root,0755)
+# % doc %{_javadocdir}/%{name}

%files scripts
%defattr(0755,root,root,0755)



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

< Previous Next >
This Thread
  • No further messages