Hello community,
here is the log from the commit of package jakarta-commons-modeler for
openSUSE:Factory checked in at 2017-09-20 17:09:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-modeler (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-modeler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-modeler"
Wed Sep 20 17:09:01 2017 rev:19 rq:527006 version:2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-modeler/jakarta-commons-modeler.changes
2017-05-22 10:49:03.891540839 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-modeler.new/jakarta-commons-modeler.changes
2017-09-20 17:09:03.840189096 +0200
@@ -1,0 +2,11 @@
+Mon Sep 18 11:43:04 UTC 2017 - [email protected]
+
+- Removed patch:
+ * jakarta-commons-modeler-java14compat.patch
+ - Not needed, since we pass those source and target levels to
+ ant on command-line
+- Clean spec file and fix a warning
+- Specify to ant dependencies on command-line instead of using
+ system-wide classpath
+
+-------------------------------------------------------------------
Old:
----
jakarta-commons-modeler-java14compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-modeler.spec ++++++
--- /var/tmp/diff_new_pack.S4gjf0/_old 2017-09-20 17:09:04.656074243 +0200
+++ /var/tmp/diff_new_pack.S4gjf0/_new 2017-09-20 17:09:04.656074243 +0200
@@ -26,8 +26,8 @@
Group: Development/Libraries/Java
Url: http://jakarta.apache.org/commons/modeler/
Source0: %{short_name}-%{version}-src.tar.bz2
-Patch0: %{name}-java14compat.patch
BuildRequires: ant
+BuildRequires: fdupes
BuildRequires: jakarta-commons-digester
BuildRequires: javapackages-tools
BuildRequires: junit
@@ -42,9 +42,8 @@
Requires: jaxp_transform_impl
Requires: mx4j
Requires: xml-commons-apis
-Provides: %{short_name}
-Obsoletes: %{short_name}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Provides: %{short_name} = %{version}-%{release}
+Obsoletes: %{short_name} < %{version}-%{release}
BuildArch: noarch
%description
@@ -68,13 +67,20 @@
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p1
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%build
-export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl
jaxp_transform_impl mx4j/mx4j-jmx junit commons-beanutils commons-collections
commons-digester commons-logging)
-ant dist
+ant \
+ -Dant.jar=$(build-classpath ant) \
+ -Djaxp.parser.jar=$(build-classpath jaxp_parser_impl) \
+ -Djaxp.xalan.jar=$(build-classpath jaxp_trasform_impl) \
+ -Djmx.jar=$(build-classpath mx4j/mx4j-jmx) \
+ -Djunit.jar=$(build-classpath junit) \
+ -Dcommons-digester.jar=$(build-classpath commons-digester) \
+ -Dcommons-logging.jar=$(build-classpath commons-logging) \
+ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
+ dist
%install
# jars
@@ -85,14 +91,13 @@
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files
-%defattr(0644,root,root,0755)
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
%{_javadir}/*
%files javadoc
-%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%changelog
