Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2015-04-02 16:00:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2014-12-10 23:46:39.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2015-04-02 16:00:53.000000000 +0200
@@ -1,0 +2,53 @@
+Wed Apr 1 08:40:57 UTC 2015 - [email protected]
+
+- Drop dependency over source-highlight as it causes build cycle
+
+-------------------------------------------------------------------
+Tue Mar 31 10:28:12 UTC 2015 - [email protected]
+
+- Try to break buildcycle detected on Factory
+
+-------------------------------------------------------------------
+Wed Mar 18 10:44:29 UTC 2015 - [email protected]
+
+- Fix build on SLE11
+
+-------------------------------------------------------------------
+Tue Mar 17 14:39:51 UTC 2015 - [email protected]
+
+- Use python-devel instead of pkgconfig to build on sle11
+
+-------------------------------------------------------------------
+Tue Mar 17 14:02:21 UTC 2015 - [email protected]
+
+- Add python-javapackages as requirement for main package
+
+-------------------------------------------------------------------
+Tue Mar 17 13:35:17 UTC 2015 - [email protected]
+
+- Update requires on python packages to properly have all the needed
+ dependencies on runtime
+
+-------------------------------------------------------------------
+Tue Mar 17 09:34:37 UTC 2015 - [email protected]
+
+- Install macros to /etc/rpm as we do in SUSE:
+ * suse-macros-install-location.patch
+- Cleanup with spec-cleaner
+
+-------------------------------------------------------------------
+Fri Jan 23 20:59:04 UTC 2015 - [email protected]
+
+- Drop patches
+ * depgen.patch
+ * javapackages-2.0.1-fix-bashisms.patch
+ * javapackages-2.0.1-java9.patch
+ * maven_depmap-no-attribute-exit.patch
+- Remove hacky workarounds
+- Fix rpmlint errors
+- Enable maven-local
+- Avoid unsatisfiable dependencies
+- Enable unit tests
+- Update to version 4.4.0
+
+-------------------------------------------------------------------
Old:
----
depgen.patch
javapackages-2.0.1-fix-bashisms.patch
javapackages-2.0.1-java9.patch
javapackages-2.0.1.tar.xz
maven_depmap-no-attribute-exit.patch
New:
----
javapackages-4.4.0.tar.xz
suse-macros-install-location.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ javapackages-tools.spec ++++++
--- /var/tmp/diff_new_pack.syU5Cz/_old 2015-04-02 16:00:54.000000000 +0200
+++ /var/tmp/diff_new_pack.syU5Cz/_new 2015-04-02 16:00:54.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package javapackages-tools
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,136 +16,145 @@
#
-# temporary turn off maven-local build to not add unsatisfied dependencies
-# to Factory - remove them on maven submission
-%bcond_with mavenlocal
-
Name: javapackages-tools
-Version: 2.0.1
+Version: 4.4.0
Release: 0
Summary: Macros and scripts for Java packaging support
License: BSD-3-Clause
Group: Development/Languages/Java
-
-Url: https://git.fedorahosted.org/cgit/javapackages.git/
-Source0:
https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
+Url: https://fedorahosted.org/released/javapackages/doc/
+Source:
https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
#PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64
on 64bits
# where Fedora use jpackage convention - usr/lib everywhere
Patch0: suse-use-libdir.patch
-# PATCH-FIX-UPSTREAM Drain stdin in dependency generator
-Patch1: depgen.patch
-# PATCH-FIX-SLE maven_depmap-no-attribute-exit.patch - fix ZipFile instance
has no attribute '__exit__'
-Patch2: maven_depmap-no-attribute-exit.patch
-Patch3: javapackages-2.0.1-fix-bashisms.patch
-# PATCH-FIX-OPENSUSE javapackages-2.0.1-java9.patch - add directories for java9
-Patch4: javapackages-2.0.1-java9.patch
-
-#BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+#PATCH-FIX-SUSE: We put macros to /etc/rpm directly so make it reflected by
+# the install script
+Patch1: suse-macros-install-location.patch
BuildRequires: asciidoc
+BuildRequires: dia
+BuildRequires: fdupes
+BuildRequires: python-devel
+BuildRequires: python-lxml
+BuildRequires: python-nose
+BuildRequires: python-pyxb
+BuildRequires: python-setuptools
+BuildRequires: python-six
+BuildRequires: rpm
BuildRequires: xmlto
BuildRequires: xz
-
Requires: coreutils
+Requires: lua
+Requires: python
+# Well even tho python is split it is required for most of the operations
+Requires: python-javapackages = %{version}
+# for the xb pom conversions
+Requires: python-pyxb
+Requires: python-six
+# for xml.dom.minidom
+Requires: python-xml
+Provides: jpackage-utils = %{version}
+Provides: jpackage-utils-java9 = %{version}
+Obsoletes: jpackage-utils <= 1.7.5
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# for xsltproc
%if 0%{?suse_version} == 1110
+# disable pbc on sle11 as there is clash in directories we don't care about
+BuildRequires: -post-build-checks
Requires: libxslt
%else
Requires: libxslt-tools
%endif
-Requires: lua
-Requires: python
-# for xml.dom.minidom
-Requires: python-xml
-
-Provides: jpackage-utils = %{version}-%{release}
-Provides: jpackage-utils-java9
-Obsoletes: jpackage-utils <= 1.7.5
%description
This package provides macros and scripts to support Java packaging.
-%if %{with mavenlocal}
%package -n maven-local
Summary: Macros and scripts for Maven packaging support
Group: Development/Languages/Java
-Requires: %{name} = %{version}-%{release}
-Requires: maven
-Requires: xmvn
-# POM files needed by maven itself
-Requires: apache-commons-parent
-Requires: apache-parent
-Requires: geronimo-parent-poms
-Requires: httpcomponents-project
-Requires: jboss-parent
-Requires: jvnet-parent
-Requires: maven-parent
-Requires: maven-plugins-pom
-Requires: mojo-parent
-Requires: plexus-components-pom
-Requires: plexus-pom
-Requires: plexus-tools-pom
-Requires: sonatype-oss-parent
-Requires: weld-parent
-# Common Maven plugins required by almost every build. It wouldn't make
-# sense to explicitly require them in every package built with Maven.
-Requires: maven-assembly-plugin
-Requires: maven-compiler-plugin
-Requires: maven-enforcer-plugin
-Requires: maven-jar-plugin
-Requires: maven-javadoc-plugin
-Requires: maven-surefire-plugin
-# Tests based on JUnit are very common and JUnit itself is small.
-# Include JUnit provider for Surefire just for convenience.
-Requires: maven-surefire-provider-junit
-# testng is quite common as well
-Requires: maven-surefire-provider-testng
+Requires: %{name} = %{version}
+Requires: javapackages-local = %{version}
%description -n maven-local
This package provides macros and scripts to support packaging Maven artifacts.
-%endif
+
+%package -n ivy-local
+Summary: Local mode for Apache Ivy
+Group: Development/Languages/Java
+Requires: %{name} = %{version}
+Requires: ant
+Requires: javapackages-local = %{version}
+
+%description -n ivy-local
+This package implements local mode fow Apache Ivy, which allows
+artifact resolution using XMvn resolver.
+
+%package -n python-javapackages
+Summary: Module for handling various files for Java packaging
+Group: Development/Languages/Java
+Requires: python-lxml
+
+%description -n python-javapackages
+Module for handling, querying and manipulating of various files for Java
+packaging in Linux distributions
+
+%package doc
+Summary: Guide for Java packaging
+Group: Development/Languages/Java
+
+%description doc
+User guide for Java packaging and using utilities from javapackages-tools
+
+%package -n javapackages-local
+Summary: Non-essential macros and scripts for Java packaging support
+Group: Development/Languages/Java
+Requires: %{name} = %{version}
+
+%description -n javapackages-local
+This package provides non-essential macros and scripts to support Java
packaging.
%prep
%setup -q -n javapackages-%{version}
%patch0 -p1
%patch1 -p1
-%if 0%{?suse_version} == 1110
-%patch2 -p1
-%endif
-%patch3 -p1
-%patch4 -p1
%build
-%{configure}
+%configure --rpmconfigdir=%{_sysconfdir}/rpm/
./build
%install
-# temporary hack to avoid rpm crash
-sed -i -e "s,^.*fileattrs/javadoc.attr,# out," install
-
./install
sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
-%if %{without mavenlocal}
-cd %{buildroot}
-rm etc/rpm/macros.xmvn \
- etc/maven/metadata-org-apache-maven-plugins.xml \
- etc/maven/metadata-org-codehaus-mojo.xml \
- usr/share/java-utils/xmvn_config_editor.sh \
- usr/bin/mvn-* \
- usr/share/xmvn/configuration*.xml
-cd -
-%endif
+rm -rf %{buildroot}%{_datadir}/fedora-review/
-mv files-common files-common-old
-cat files-common-old | grep -v '^%dir /etc/java$' | grep -v '^%dir
/usr/share/java$' > files-common
+%fdupes %{buildroot}/%{_prefix}
+
+%check
+%if 0%{?suse_version} >= 1210
+./check
+%endif
%files -f files-common
%defattr(-,root,root,-)
%doc LICENSE
-%if %{with mavenlocal}
+%files -n javapackages-local -f files-local
+%defattr(-,root,root,-)
+
%files -n maven-local -f files-maven
-%endif
+%defattr(-,root,root,-)
+
+%files -n ivy-local -f files-ivy
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/ant.d
+
+%files -n python-javapackages
+%defattr(-,root,root,-)
+%doc LICENSE
+%{python_sitelib}/javapackages*
+
+%files doc -f files-doc
+%defattr(-,root,root,-)
+%doc LICENSE
%changelog
++++++ javapackages-2.0.1.tar.xz -> javapackages-4.4.0.tar.xz ++++++
++++ 38141 lines of diff (skipped)
++++++ suse-macros-install-location.patch ++++++
Index: javapackages-4.4.0/install
===================================================================
--- javapackages-4.4.0.orig/install
+++ javapackages-4.4.0/install
@@ -126,8 +126,8 @@ inst_exec java-utils/java-wrapper "${jav
inst_data java-utils/maven_depmap.py "${javadir}-utils"
inst_data java-utils/pom_editor.py "${javadir}-utils"
-inst_data target/macros.jpackage "${rpmconfigdir}/macros.d"
-inst_data target/macros.fjava "${rpmconfigdir}/macros.d"
+inst_data target/macros.jpackage "${rpmconfigdir}"
+inst_data target/macros.fjava "${rpmconfigdir}"
inst_data target/build-classpath.1 "${mandir}/man1"
inst_data target/build-jar-repository.1 "${mandir}/man1"
@@ -174,7 +174,7 @@ link "${m2home}/configuration-rpmbuild-r
inst_config etc/javapackages-config.json "${javaconfdir}"
exec >files-local
-inst_data target/macros.xmvn "${rpmconfigdir}/macros.d"
+inst_data target/macros.xmvn "${rpmconfigdir}"
inst_data java-utils/mvn_alias.py "${javadir}-utils"
inst_data java-utils/mvn_artifact.py "${javadir}-utils"
++++++ suse-use-libdir.patch ++++++
--- /var/tmp/diff_new_pack.syU5Cz/_old 2015-04-02 16:00:54.000000000 +0200
+++ /var/tmp/diff_new_pack.syU5Cz/_new 2015-04-02 16:00:54.000000000 +0200
@@ -1,12 +1,35 @@
+Date: Sat, 7 Mar 2015 19:25:15 +0100
+Subject: [PATCH] SUSE does store jvm related things in libdir
+
---
- configure | 2 ++
- etc/macros.jpackage | 12 ++++++------
+ configure | 2 ++
+ macros.d/macros.jpackage | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
-Index: javapackages-2.0.1/etc/macros.jpackage
-===================================================================
---- javapackages-2.0.1.orig/etc/macros.jpackage
-+++ javapackages-2.0.1/etc/macros.jpackage
+diff --git a/configure b/configure
+index da2fd40..54935ce 100755
+--- a/configure
++++ b/configure
+@@ -41,6 +41,7 @@ prefix
+ rundir
+ sysconfdir
+ rpmconfigdir
++libdir
+
+ m2home
+
+@@ -76,6 +77,7 @@ test -z "${localstatedir}" && localstatedir="${prefix}/var"
+ test -z "${mandir}" && mandir="${datadir}/man"
+ test -z "${rundir}" && rundir="${localstatedir}/run"
+ test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
++test -z "${libdir}" && rpmconfigdir="${prefix}/lib/"
+ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
+
+ test -z "${m2home}" && m2home="${datadir}/xmvn"
+diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
+index 62d2dc1..75a5ba3 100644
+--- a/macros.d/macros.jpackage
++++ b/macros.d/macros.jpackage
@@ -13,22 +13,22 @@
#
# Root directory where all Java VMs/SDK/JREs are installed.
@@ -43,7 +66,7 @@
#
# Root directory for all common architecture independent parts of Java
VM/SDK/JRE's
-@@ -81,7 +81,7 @@
+@@ -86,7 +86,7 @@
# - jars for Java standard x.y.z (usually symlinks to %{_jnidir}-ext)
# To simplify things only %{_jnidir} is defined.
#
@@ -52,23 +75,6 @@
#
# Root directory where all javadoc is installed. Also already in RH macros.
-Index: javapackages-2.0.1/configure
-===================================================================
---- javapackages-2.0.1.orig/configure
-+++ javapackages-2.0.1/configure
-@@ -39,6 +39,7 @@ mandir
- prefix
- sysconfdir
- rpmconfigdir
-+libdir
-
- javadir
- javadocdir
-@@ -68,6 +69,7 @@ test -z "${datadir}" && datadir="${prefi
- test -z "${mandir}" && mandir="${datadir}/man"
- test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
- test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
-+test -z "${libdir}" && libdir="${prefix}/lib"
-
- eval $(sed -n 's/^%_\('"$vars_re"'\)\
*\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' etc/macros.jpackage)
-
+--
+2.1.4
+
