commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2020-09-08 22:55:22
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.3399 (New)
Package is "javapackages-tools"
Tue Sep 8 22:55:22 2020 rev:24 rq:832816 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2020-07-17 20:44:28.396515779 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.3399/javapackages-tools.changes
2020-09-08 22:55:25.147756246 +0200
@@ -1,0 +2,6 @@
+Mon Sep 7 12:50:32 UTC 2020 - Dominique Leuenberger
+
+- when building extra flavor, BuildRequire javapackages-filesystem:
+ /etc/java is being cleaned out of the filesystems package.
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.sjZN1X/_old 2020-09-08 22:55:25.859756602 +0200
+++ /var/tmp/diff_new_pack.sjZN1X/_new 2020-09-08 22:55:25.863756605 +0200
@@ -48,7 +48,11 @@
BuildRequires: perl
BuildRequires: rpm
BuildRequires: xmlto
+%if %{with python}
+BuildRequires: javapackages-filesystem
+%else
Requires: javapackages-filesystem = %{version}-%{release}
+%endif
# Used on too many places
Provides: jpackage-utils = %{version}
Obsoletes: %{name}-doc
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2020-07-17 20:44:17
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.3592 (New)
Package is "javapackages-tools"
Fri Jul 17 20:44:17 2020 rev:23 rq:821264 version:5.3.1
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2020-05-07 15:06:39.691859347 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.3592/javapackages-tools.changes
2020-07-17 20:44:28.396515779 +0200
@@ -1,0 +2,9 @@
+Thu Jul 16 07:23:37 UTC 2020 - Fridrich Strba
+
+- Upgrade to version 5.3.1
+- Modified patch:
+ * suse-use-libdir.patch
++ rediff to changed context
+- Define _rpmmacrodir for distributions that don't have it
+
+---
Old:
5.3.0.tar.gz
New:
5.3.1.tar.gz
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.BgQbWO/_old 2020-07-17 20:44:29.748517220 +0200
+++ /var/tmp/diff_new_pack.BgQbWO/_new 2020-07-17 20:44:29.752517224 +0200
@@ -16,6 +16,7 @@
#
+%{!?_rpmmacrodir:%global _rpmmacrodir %{_rpmconfigdir}/macros.d}
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "extras"
%bcond_without python
@@ -27,7 +28,7 @@
%else
Name: javapackages-tools
%endif
-Version:5.3.0
+Version:5.3.1
Release:0
Summary:Macros and scripts for Java packaging support
License:BSD-3-Clause
++ 5.3.0.tar.gz -> 5.3.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-5.3.0/.travis.yml
new/javapackages-5.3.1/.travis.yml
--- old/javapackages-5.3.0/.travis.yml 2018-08-06 17:09:06.0 +0200
+++ new/javapackages-5.3.1/.travis.yml 2019-06-14 12:26:27.0 +0200
@@ -1,6 +1,5 @@
language: python
python:
- - 2.6 # RHEL 6
- 2.7 # RHEL 7
- 3.5 # Fedora 24-25
- 3.6 # Fedora 26+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-5.3.0/VERSION
new/javapackages-5.3.1/VERSION
--- old/javapackages-5.3.0/VERSION 2018-08-06 17:09:06.0 +0200
+++ new/javapackages-5.3.1/VERSION 2019-06-14 12:26:27.0 +0200
@@ -1 +1 @@
-5.3.0
+5.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-5.3.0/java-utils/maven_depmap.py
new/javapackages-5.3.1/java-utils/maven_depmap.py
--- old/javapackages-5.3.0/java-utils/maven_depmap.py 2018-08-06
17:09:06.0 +0200
+++ new/javapackages-5.3.1/java-utils/maven_depmap.py 2019-06-14
12:26:27.0 +0200
@@ -85,7 +85,7 @@
def _make_files_versioned(versions, pom_path, jar_path, pom_base, jar_base):
"""Make pom and jar file versioned"""
-versions = list(set(versions.split(',')))
+versions = sorted(set(versions.split(',')))
vpom_path = pom_path
vjar_path = jar_path
@@ -179,11 +179,11 @@
return artifact
aliases = additions.split(',')
-result = set()
+result = list()
for a in aliases:
alias = MetadataAlias.from_mvn_str(a)
alias.extension = artifact.extension
-result.add(alias)
+result.append(alias)
artifact.aliases = result
return artifact
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-5.3.0/javapackages-tools.spec
new/javapackages-5.3.1/javapackages-tools.spec
--- old/javapackages-5.3.0/javapackages-tools.spec 2018-08-06
17:09:06.0 +0200
+++ new/javapackages-5.3.1/javapackages-tools.spec 2019-06-14
12:26:27.0 +0200
@@ -138,7 +138,7 @@
# Java build systems don't have hard requirement on java-devel, so it should
be there
Requires: java-1.8.0-openjdk-devel
Requires: %{?scl_prefix}%{python_prefix}-javapackages =
%{version}-%{release}
-Requires: %{python_prefix}
+Requires: %{python_interpreter}
%description -n %{?scl_prefix}javapackages-local
This package provides non-essential macros and scripts to support Java
packaging.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/javapackages-5.3.0/macros.d/macros.javapackages-filesystem
new/javapackages-5.3.1/macros.d/macros.javapackages-filesystem
--- old/javapackages-5.3.0/macros.d/macros.javapackages-filesystem
2018-08-06 17:09:06.0 +0200
+++ new/javapackages-5.3.1/macros.d/macros.javapackages-filesystem
2019-06-14 12:26:27.0 +0200
@@ -38,17 +38,17 @@
#
# Root directory for all common architecture
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2020-05-07 15:06:38
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.2738 (New)
Package is "javapackages-tools"
Thu May 7 15:06:38 2020 rev:22 rq:800404 version:5.3.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2019-04-08 11:24:22.268225243 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.2738/javapackages-tools.changes
2020-05-07 15:06:39.691859347 +0200
@@ -1,0 +2,6 @@
+Tue May 5 12:32:03 UTC 2020 - Dominique Leuenberger
+
+- Use %{_rpmmacrodir} instead of %{_libexecdir}/rpm/macros.d: this
+ just happens to overlap in some distros.
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.E2VeYr/_old 2020-05-07 15:06:40.503861143 +0200
+++ /var/tmp/diff_new_pack.E2VeYr/_new 2020-05-07 15:06:40.503861143 +0200
@@ -1,7 +1,7 @@
#
# spec file for package javapackages-tools
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -167,8 +167,8 @@
%{_datadir}/java-utils/java-functions
%{_datadir}/java-utils/java-wrapper
%{_datadir}/java-utils/scl-enable
-%{_libexecdir}/rpm/macros.d/macros.jpackage
-%{_libexecdir}/rpm/macros.d/macros.javapackages-filesystem
+%{_rpmmacrodir}/macros.jpackage
+%{_rpmmacrodir}/macros.javapackages-filesystem
%{_mandir}/man1/build-classpath.1
%{_mandir}/man1/build-jar-repository.1
%{_mandir}/man1/diff-jars.1
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2019-04-08 11:24:21
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.3908 (New)
Package is "javapackages-tools"
Mon Apr 8 11:24:21 2019 rev:21 rq:691970 version:5.3.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2019-04-05 11:55:42.966295213 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.3908/javapackages-tools.changes
2019-04-08 11:24:22.268225243 +0200
@@ -1,0 +2,10 @@
+Sat Apr 6 07:15:46 UTC 2019 - Fridrich Strba
+
+- Rename gradle-local and ivy-local to javapackages-gradle and
+ javapackages-ivy and let them depend only on javapackages-tools
+ and javapackages-local. These packages only install files
+ produced during the javapackages-tools build. The dependencies
+ will be pulled by gradle-local, ivy-local and maven-local
+ meta-packages built in a separate spec file.
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.8fbhDw/_old 2019-04-08 11:24:23.524225645 +0200
+++ /var/tmp/diff_new_pack.8fbhDw/_new 2019-04-08 11:24:23.528225647 +0200
@@ -75,28 +75,26 @@
install their content.
%if %{with python}
-%package -n gradle-local
-Summary:Local mode for Gradle
+%package -n javapackages-gradle
+Summary:Local mode for Gradle (files)
Group: Development/Languages/Java
Requires: javapackages-local = %{version}
Requires: javapackages-tools = %{version}
-%description -n gradle-local
-This package implements local mode for Gradle, which allows artifact
-resolution using XMvn resolver.
+%description -n javapackages-gradle
+This package contains files needed by local mode for Gradle, which
+allows artifact resolution using XMvn resolver.
-%package -n ivy-local
-Summary:Local mode for Apache Ivy
+
+%package -n javapackages-ivy
+Summary:Local mode for Apache Ivy (files)
Group: Development/Languages/Java
-Requires: ant
-Requires: apache-ivy >= 2.3.0
Requires: javapackages-local = %{version}
Requires: javapackages-tools = %{version}
-Requires: xmvn-connector-ivy
-%description -n ivy-local
-This package implements local mode fow Apache Ivy, which allows
-artifact resolution using XMvn resolver.
+%description -n javapackages-ivy
+This package contains files needed by local mode fow Apache Ivy, which
+allows artifact resolution using XMvn resolver.
%package -n python3-javapackages
Summary:Module for handling various files for Java packaging
@@ -202,10 +200,10 @@
%files -n javapackages-local -f files-local
%dir %{_datadir}/java-utils
-%files -n gradle-local -f files-gradle
+%files -n javapackages-gradle -f files-gradle
%dir %{_datadir}/gradle-local
-%files -n ivy-local -f files-ivy
+%files -n javapackages-ivy -f files-ivy
%dir %{_sysconfdir}/ant.d
%files -n python3-javapackages
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2019-04-05 11:55:41
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.3908 (New)
Package is "javapackages-tools"
Fri Apr 5 11:55:41 2019 rev:20 rq:691420 version:5.3.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2019-03-08 13:28:33.874992080 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.3908/javapackages-tools.changes
2019-04-05 11:55:42.966295213 +0200
@@ -1,0 +2,12 @@
+Thu Apr 4 08:01:41 UTC 2019 - Fridrich Strba
+
+- Split maven-local meta-package out of javapackages-tools spec
+ file
+
+---
+Wed Apr 3 09:42:32 UTC 2019 - Fridrich Strba
+
+- Make the ivy-local and maven-local sub-packages depend on the
+ right stuff, so that they actually can be used for building
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.AkL4XI/_old 2019-04-05 11:55:44.214296219 +0200
+++ /var/tmp/diff_new_pack.AkL4XI/_new 2019-04-05 11:55:44.214296219 +0200
@@ -75,15 +75,6 @@
install their content.
%if %{with python}
-%package -n maven-local
-Summary:Macros and scripts for Maven packaging support
-Group: Development/Languages/Java
-Requires: javapackages-local = %{version}
-Requires: javapackages-tools = %{version}
-
-%description -n maven-local
-This package provides macros and scripts to support packaging Maven artifacts.
-
%package -n gradle-local
Summary:Local mode for Gradle
Group: Development/Languages/Java
@@ -98,8 +89,10 @@
Summary:Local mode for Apache Ivy
Group: Development/Languages/Java
Requires: ant
+Requires: apache-ivy >= 2.3.0
Requires: javapackages-local = %{version}
Requires: javapackages-tools = %{version}
+Requires: xmvn-connector-ivy
%description -n ivy-local
This package implements local mode fow Apache Ivy, which allows
@@ -110,7 +103,8 @@
Group: Development/Languages/Java
Requires: python3-lxml
Requires: python3-six
-Obsoletes: python-javapackages
+Obsoletes: python-javapackages < %{version}-%{release}
+Provides: python-javapackages = %{version}-%{release}
%description -n python3-javapackages
Module for handling, querying and manipulating of various files for Java
@@ -208,8 +202,6 @@
%files -n javapackages-local -f files-local
%dir %{_datadir}/java-utils
-%files -n maven-local -f files-maven
-
%files -n gradle-local -f files-gradle
%dir %{_datadir}/gradle-local
commit javapackages-tools for openSUSE:Factory
Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2019-03-08 13:28:32 Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new.28833 (New) Package is "javapackages-tools" Fri Mar 8 13:28:32 2019 rev:19 rq:681525 version:5.3.0 Changes: --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2018-12-07 14:32:43.851269813 +0100 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new.28833/javapackages-tools.changes 2019-03-08 13:28:33.874992080 +0100 @@ -1,0 +2,7 @@ +Mon Mar 4 17:34:49 UTC 2019 - Fridrich Strba + +- Provide both com.sun:tools and sun.jdk:jconsole that are part of + standard OpenJDK installation. These provides cannot be generated + from metadata due to build sequence. + +--- Other differences: -- ++ javapackages-tools.spec ++ --- /var/tmp/diff_new_pack.1IJhy1/_old 2019-03-08 13:28:34.574991957 +0100 +++ /var/tmp/diff_new_pack.1IJhy1/_new 2019-03-08 13:28:34.578991957 +0100 @@ -1,7 +1,7 @@ # # spec file for package javapackages-tools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -58,6 +58,9 @@ BuildRequires: python3-setuptools BuildRequires: python3-six BuildArch: noarch +%else +Provides: mvn(com.sun:tools) = SYSTEM +Provides: mvn(sun.jdk:jconsole) = SYSTEM %endif %description
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2018-12-07 14:32:38
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new.19453 (New)
Package is "javapackages-tools"
Fri Dec 7 14:32:38 2018 rev:18 rq:654379 version:5.3.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2018-11-06 15:40:09.371178716 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new.19453/javapackages-tools.changes
2018-12-07 14:32:43.851269813 +0100
@@ -1,0 +2,14 @@
+Tue Nov 27 18:36:57 UTC 2018 - Fridrich Strba
+
+- Modified patch:
+ * suse-use-libdir.patch
++ fix directories for eclipse.conf too
+
+---
+Sun Nov 11 15:21:24 UTC 2018 - Fridrich Strba
+
+- Make the javapackages-local package depend on java-devel. It is
+ used for package building and this avoids each package to require
+ java-devel itself.
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.afpJTG/_old 2018-12-07 14:32:44.823268607 +0100
+++ /var/tmp/diff_new_pack.afpJTG/_new 2018-12-07 14:32:44.827268603 +0100
@@ -116,6 +116,7 @@
%package -n javapackages-local
Summary:Non-essential macros and scripts for Java packaging support
Group: Development/Languages/Java
+Requires: java-devel
Requires: javapackages-tools = %{version}
Requires: python3-javapackages = %{version}
++ suse-use-libdir.patch ++
--- /var/tmp/diff_new_pack.afpJTG/_old 2018-12-07 14:32:44.867268553 +0100
+++ /var/tmp/diff_new_pack.afpJTG/_new 2018-12-07 14:32:44.867268553 +0100
@@ -1,16 +1,6 @@
-Date: Sat, 7 Mar 2015 19:25:15 +0100
-Subject: [PATCH] SUSE does store jvm related things in libdir
-
- configure| 2 ++
- macros.d/macros.jpackage | 12 ++--
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
-===
javapackages-5.2.0+git20180620.70fa2258.orig/configure-base.sh
-+++ javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
-@@ -14,6 +14,7 @@ sysconfdir
+--- javapackages-5.3.0/configure-base.sh 2018-08-06 17:09:06.0
+0200
javapackages-5.3.0/configure-base.sh 2018-11-28 06:33:58.811049137
+0100
+@@ -14,6 +14,7 @@
root_sysconfdir
rpmconfigdir
rpmmacrodir
@@ -18,18 +8,69 @@
m2home
-@@ -51,6 +52,7 @@ test -z "${mandir}" && mandir="${datadir
+@@ -51,6 +52,7 @@
test -z "${rundir}" && rundir="${localstatedir}/run"
test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
test -z "${root_sysconfdir}" && root_sysconfdir="${prefix}/etc"
-+test -z "${libdir}" && rpmconfigdir="${prefix}/lib/"
++test -z "${libdir}" && libdir="${prefix}/lib/"
test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
-Index:
javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-filesystem
-===
javapackages-5.2.0+git20180620.70fa2258.orig/macros.d/macros.javapackages-filesystem
-+++
javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-filesystem
+--- javapackages-5.3.0/etc/eclipse.conf2018-08-06 17:09:06.0
+0200
javapackages-5.3.0/etc/eclipse.conf2018-11-28 06:33:58.811049137
+0100
+@@ -1,7 +1,7 @@
+ # Eclipse filesystem configuration file
+
+ # Eclipse platform root directory
+-eclipse.root=@{prefix}/lib/eclipse
++eclipse.root=@{libdir}/eclipse
+
+ # Location of architecture-independant dropins
+ eclipse.dropins.noarch=@{datadir}/eclipse/dropins
+@@ -10,10 +10,10 @@
+ eclipse.droplets.noarch=@{datadir}/eclipse/droplets
+
+ # Location of architecture-dependant dropins
+-eclipse.dropins.archful=@{prefix}/lib/eclipse/dropins
++eclipse.dropins.archful=@{libdir}/eclipse/dropins
+
+ # Location of architecture-dependant droplets
+-eclipse.droplets.archful=@{prefix}/lib/eclipse/droplets
++eclipse.droplets.archful=@{libdir}/eclipse/droplets
+
+ # Comma-separated list of directories searched for external bundles
+ eclipse.bundles=@{javadir},@{jnidir}
+--- javapackages-5.3.0/expand.sh 2018-08-06 17:09:06.0 +0200
javapackages-5.3.0/expand.sh 2018-11-28 06:33:58.811049137 +0100
+@@ -45,6 +45,7 @@
+ -e "s|@{scl_suffix}|${scl_suffix}|g" \
+ -e "s|@{bindir}|${bindir}|g" \
+ -e "s|@{datadir}|${datadir}|g" \
++-e
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2018-11-06 15:38:53
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New)
Package is "javapackages-tools"
Tue Nov 6 15:38:53 2018 rev:17 rq:646351 version:5.3.0
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2018-07-26 10:16:48.307763410 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2018-11-06 15:40:09.371178716 +0100
@@ -1,0 +2,24 @@
+Mon Nov 5 09:34:51 UTC 2018 - Fridrich Strba
+
+- Replace the occurences of /usr/lib by libdir in configuration
+ files too
+
+---
+Wed Oct 24 08:19:24 UTC 2018 - Fridrich Strba
+
+- Update to version 5.3.0
+- Modified patch:
+ * suse-no-epoch.patch
++ rediff to changed code
+- Build the :extras flavour as noarch
+
+---
+Wed Oct 24 07:53:45 UTC 2018 - Fridrich Strba
+
+- Added patch:
+ * suse-no-epoch.patch
++ we did not bump epoch of OpenJDK packages in SUSE
++ fix a potential generation of unresolvable requires
++ adapt the tests to not expect the epoch
+
+---
Old:
javapackages-5.2.0+git20180620.70fa2258.tar.xz
New:
5.3.0.tar.gz
suse-no-epoch.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.oQMTZj/_old 2018-11-06 15:40:11.467175545 +0100
+++ /var/tmp/diff_new_pack.oQMTZj/_new 2018-11-06 15:40:11.475175534 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -27,24 +27,27 @@
%else
Name: javapackages-tools
%endif
-Version:5.2.0+git20180620.70fa2258
+Version:5.3.0
Release:0
Summary:Macros and scripts for Java packaging support
License:BSD-3-Clause
Group: Development/Languages/Java
URL:https://github.com/fedora-java/javapackages
-# Latest tag is missing, quite often needs patches, use service
-Source: javapackages-%{version}.tar.xz
+Source0:
https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
#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-SUSE: allow building without python to reduce depgraph
Patch1: python-optional.patch
+#PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora
did
+# Avoid generating unresolvable requires
+Patch2: suse-no-epoch.patch
BuildRequires: asciidoc
BuildRequires: fdupes
+BuildRequires: perl
BuildRequires: rpm
BuildRequires: xmlto
-BuildRequires: xz
+Requires: javapackages-filesystem = %{version}-%{release}
# Used on too many places
Provides: jpackage-utils = %{version}
Obsoletes: %{name}-doc
@@ -54,11 +57,20 @@
BuildRequires: python3-nose
BuildRequires: python3-setuptools
BuildRequires: python3-six
+BuildArch: noarch
%endif
%description
This package provides macros and scripts to support Java packaging.
+%package -n javapackages-filesystem
+Summary:Java packages filesystem layout
+Group: Development/Languages/Java
+
+%description -n javapackages-filesystem
+This package provides some basic directories into which Java packages
+install their content.
+
%if %{with python}
%package -n maven-local
Summary:Macros and scripts for Maven packaging support
@@ -115,6 +127,10 @@
%setup -q -n javapackages-%{version}
%autopatch -p1
+# The usr/lib is hardcoded in configuration files too
+new_dir=$(echo %{_libdir} | sed 's#/##')
+perl -pi -e "s#usr/lib#${new_dir}#g" configs/*.xml
+
%build
%configure \
%if %{with python}
@@ -169,9 +185,6 @@
for i in $files; do
rm -rf %{buildroot}/$i
done
-%else
-# we want this in the basic package always
-cat files-filesystem >> files-tools
%endif
rm -rf %{buildroot}%{_datadir}/fedora-review/
@@ -184,7 +197,9 @@
%if !%{with python}
%files -f files-tools
%license LICENSE
-%dir %{_datadir}/maven-metadata
+
+%files -n javapackages-filesystem -f files-filesystem
+
%else
%files -n javapackages-local -f files-local
%dir %{_datadir}/java-utils
++ suse-no-epoch.patch ++
---
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2018-07-26 10:16:42
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New)
Package is "javapackages-tools"
Thu Jul 26 10:16:42 2018 rev:16 rq:625189 version:5.2.0+git20180620.70fa2258
Changes:
--- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes
2018-01-30 15:41:51.693725658 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2018-07-26 10:16:48.307763410 +0200
@@ -1,0 +2,27 @@
+Tue Jul 24 14:09:47 UTC 2018 - tchva...@suse.com
+
+- Switch to multibuild layout
+
+---
+Tue Jul 24 13:45:21 UTC 2018 - tchva...@suse.com
+
+- Update to version 5.2.0+git20180620.70fa2258:
+ * Rename the async kwarg in call_script to wait (reverses the logic)
+ * Actually bump version to 5.3.0 snapshot
+ * Bump version in VERSION file
+ * [man] s/Pacakge/Package/g
+ * Fix typos in README
+ * Fix configure-base.sh after filesystem macro split
+ * Split filesystem macros to separate macro file
+ * Introduce javapackages-filesystem package
+ * [java-functions] extend ABRT Java agent options
+ * change abrt-java-connector upstream URL
+ * Remove resolverSettings/prefixes from XMvn config
+ * Add macros to allow passing arbitrary options to XMvn
+ * [spec] Bump package version to 5.1.0
+ * Allow specifying custom repo when calling xmvn-install
+- Refresh patches:
+ * suse-use-libdir.patch
+ * python-optional.patch
+
+---
Old:
javapackages-5.0.0+git20180104.9367c8f6.tar.xz
javapackages-tools-extras.changes
javapackages-tools-extras.spec
pre_checkin.sh
New:
_multibuild
javapackages-5.2.0+git20180620.70fa2258.tar.xz
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.fUmF3M/_old 2018-07-26 10:16:49.819766154 +0200
+++ /var/tmp/diff_new_pack.fUmF3M/_new 2018-07-26 10:16:49.823766162 +0200
@@ -16,14 +16,23 @@
#
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "extras"
+%bcond_without python
+%else
%bcond_with python
+%endif
+%if %{with python}
+Name: javapackages-tools-%{flavor}
+%else
Name: javapackages-tools
-Version:5.0.0+git20180104.9367c8f6
+%endif
+Version:5.2.0+git20180620.70fa2258
Release:0
Summary:Macros and scripts for Java packaging support
License:BSD-3-Clause
Group: Development/Languages/Java
-Url:https://github.com/fedora-java/javapackages
+URL:https://github.com/fedora-java/javapackages
# Latest tag is missing, quite often needs patches, use service
Source: javapackages-%{version}.tar.xz
#PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64
on 64bits
@@ -146,7 +155,8 @@
%{_datadir}/java-utils/java-functions
%{_datadir}/java-utils/java-wrapper
%{_datadir}/java-utils/scl-enable
-%{_prefix}/lib/rpm/macros.d/macros.jpackage
+%{_libexecdir}/rpm/macros.d/macros.jpackage
+%{_libexecdir}/rpm/macros.d/macros.javapackages-filesystem
%{_mandir}/man1/build-classpath.1
%{_mandir}/man1/build-jar-repository.1
%{_mandir}/man1/diff-jars.1
@@ -159,6 +169,9 @@
for i in $files; do
rm -rf %{buildroot}/$i
done
+%else
+# we want this in the basic package always
+cat files-filesystem >> files-tools
%endif
rm -rf %{buildroot}%{_datadir}/fedora-review/
@@ -169,8 +182,9 @@
./check
%if !%{with python}
-%files -f files-common
-%doc LICENSE
+%files -f files-tools
+%license LICENSE
+%dir %{_datadir}/maven-metadata
%else
%files -n javapackages-local -f files-local
%dir %{_datadir}/java-utils
@@ -184,7 +198,7 @@
%dir %{_sysconfdir}/ant.d
%files -n python3-javapackages
-%doc LICENSE
+%license LICENSE
%{python3_sitelib}/javapackages*
%endif
++ _multibuild ++
extras
++ _service ++
--- /var/tmp/diff_new_pack.fUmF3M/_old 2018-07-26 10:16:49.859766227 +0200
+++ /var/tmp/diff_new_pack.fUmF3M/_new 2018-07-26 10:16:49.859766227 +0200
@@ -4,7 +4,7 @@
git
enable
javapackages
-5.0.0+git%cd.%h
+5.2.0+git%cd.%h
*.tar
++ javapackages-5.0.0+git20180104.9367c8f6.tar.xz ->
javapackages-5.2.0+git20180620.70fa2258.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/javapackages-5.0.0+git20180104.9367c8f6/README.md
new/javapackages-5.2.0+git20180620.70fa2258/README.md
--- old/javapackages-5.0.0+git20180104.9367c8f6/README.md 2018-01-04
14:06:42.0 +0100
+++
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2018-01-30 15:41:50
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New)
Package is "javapackages-tools"
Tue Jan 30 15:41:50 2018 rev:15 rq:570501 version:5.0.0+git20180104.9367c8f6
Changes:
---
/work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools-extras.changes
2017-05-31 13:32:26.337553435 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools-extras.changes
2018-01-30 15:41:51.437737609 +0100
@@ -1,0 +2,19 @@
+Mon Jan 22 09:31:20 UTC 2018 - tchva...@suse.com
+
+- Update to version 5.0.0+git20180104.9367c8f6:
+ * [java-functions] Avoid colons in jar names
+ * Workaround for SCL enable scripts not working with -e
+ * Second argument to pom_xpath_inject is mandatory
+ * [mvn_artifact] Provide more helpful error messages
+ * Fix traceback on corrupt zipfile
+ * [test] Add reproducer for rhbz#1481005
+ * [spec] Fix default JRE path
+ * [readme] Fix typo
+ * Add initial content to README.md (#21)
+ * Decouple JAVA_HOME setting from java command alternatives
+- Rebase patches:
+ * python-optional.patch
+ * suse-use-libdir.patch
+- Drop merged patch fix-abs2rel.patch
+
+---
javapackages-tools.changes: same change
Old:
fix-abs2rel.patch
javapackages-4.7.0+git20170331.ef4057e7.tar.xz
New:
javapackages-5.0.0+git20180104.9367c8f6.tar.xz
Other differences:
--
++ javapackages-tools-extras.spec ++
--- /var/tmp/diff_new_pack.xQfWou/_old 2018-01-30 15:41:52.677679721 +0100
+++ /var/tmp/diff_new_pack.xQfWou/_new 2018-01-30 15:41:52.681679535 +0100
@@ -1,7 +1,7 @@
#
# spec file for package javapackages-tools-extras
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -18,7 +18,7 @@
%bcond_without python
Name: javapackages-tools-extras
-Version:4.7.0+git20170331.ef4057e7
+Version:5.0.0+git20180104.9367c8f6
Release:0
Summary:Macros and scripts for Java packaging support
License:BSD-3-Clause
@@ -31,8 +31,6 @@
Patch0: suse-use-libdir.patch
#PATCH-FIX-SUSE: allow building without python to reduce depgraph
Patch1: python-optional.patch
-#PATCH-FIX-UPSTREAM: use proper expansion for shebang
-Patch2: fix-abs2rel.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: rpm
@@ -111,7 +109,7 @@
%build
%configure \
%if %{with python}
---pyinterpreter=/usr/bin/python3
+--pyinterpreter=%{_bindir}/python3
%else
--pyinterpreter=%{nil}
%endif
@@ -144,6 +142,7 @@
%{_bindir}/shade-jar
%{_sysconfdir}/java/font.properties
%{_sysconfdir}/java/java.conf
+%{_sysconfdir}/java/eclipse.conf
%{_datadir}/java-utils/java-functions
%{_datadir}/java-utils/java-wrapper
%{_datadir}/java-utils/scl-enable
@@ -171,26 +170,20 @@
%if !%{with python}
%files -f files-common
-%defattr(-,root,root,-)
%doc LICENSE
%else
%files -n javapackages-local -f files-local
-%defattr(-,root,root,-)
%dir %{_datadir}/java-utils
%files -n maven-local -f files-maven
-%defattr(-,root,root,-)
%files -n gradle-local -f files-gradle
-%defattr(-,root,root)
%dir %{_datadir}/gradle-local
%files -n ivy-local -f files-ivy
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/ant.d
%files -n python3-javapackages
-%defattr(-,root,root,-)
%doc LICENSE
%{python3_sitelib}/javapackages*
%endif
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.xQfWou/_old 2018-01-30 15:41:52.697678787 +0100
+++ /var/tmp/diff_new_pack.xQfWou/_new 2018-01-30 15:41:52.701678601 +0100
@@ -1,7 +1,7 @@
#
# spec file for package javapackages-tools
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -18,7 +18,7 @@
%bcond_with python
Name: javapackages-tools
-Version:4.7.0+git20170331.ef4057e7
+Version:5.0.0+git20180104.9367c8f6
Release:0
Summary:Macros and scripts for Java packaging support
License:BSD-3-Clause
@@ -31,8 +31,6 @@
Patch0: suse-use-libdir.patch
#PATCH-FIX-SUSE: allow building without python to reduce depgraph
Patch1: python-optional.patch
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2017-05-31 13:32:25
Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old)
and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New)
Package is "javapackages-tools"
Wed May 31 13:32:25 2017 rev:14 rq:497990 version:4.7.0+git20170331.ef4057e7
Changes:
New Changes file:
--- /dev/null 2017-03-01 00:40:19.279048016 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools-extras.changes
2017-05-31 13:32:26.337553435 +0200
@@ -0,0 +1,182 @@
+---
+Wed May 24 13:39:01 UTC 2017 - tchva...@suse.com
+
+- Fix typo in suse-use-libdir.patch
+
+---
+Fri May 19 10:26:41 UTC 2017 - tchva...@suse.com
+
+- Fix url to correct one https://github.com/fedora-java/javapackages
+
+---
+Thu May 18 20:11:39 UTC 2017 - tchva...@suse.com
+
+- Split to python and non-python edition for smaller depgraph
+- Add patch python-optional.patch
+- Fix abs2rel shebang:
+ * fix-abs2rel.patch
+- Fix Requires on subpackages to point to javapackages-tools proper
+
+---
+Thu May 18 19:40:26 UTC 2017 - tchva...@suse.com
+
+- Update to version 4.7.0+git20170331.ef4057e7:
+ * Reimplement abs2rel in Python
+ * Don't expand {scl} in macro definitions
+ * Install expanded rpmfc attr files
+ * [spec] Avoid file conflicts between in SCL
+ * Fix macros.d directory ownership
+ * Make %ant macro enable SCL when needed
+ * [spec] Fix file conflicts between SCL and non-SCL packages
+ * Fix ownership of ivyxmldir
+ * [test] Force locale for python processes
+ * Don't include timestamp in generated pom.properties
+- Remove patch merged by upstream:
+ * create_valid_xml_comments.patch
+- Remove patch suse-macros-install-location.patch
+ * We switch to /usr/lib/ location for macros
+- Try to reduce some dependencies bsc#1036025
+- Refresh patch suse-use-libdir.patch
+
+---
+Fri Feb 12 15:21:42 UTC 2016 - toddrme2...@gmail.com
+
+- Add create_valid_xml_comments.patch
+ python-lxml 3.5.0 introduces validation for xml comments, and
+ one of the comments created in this package were not valid.
+ This patch fixes the problem. It backported from upstream and
+ should be in the next release.
+
https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9fc80ec377e89d
+
+---
+Mon Feb 8 20:23:42 UTC 2016 - tchva...@suse.com
+
+- Version update to 4.6.0:
+ * various bugfixes for maven tooling
+ * introduction to gradle-local package for gradle packaging
+
+---
+Wed Apr 1 08:40:57 UTC 2015 - tchva...@suse.com
+
+- Drop dependency over source-highlight as it causes build cycle
+
+---
+Tue Mar 31 10:28:12 UTC 2015 - tchva...@suse.com
+
+- Try to break buildcycle detected on Factory
+
+---
+Wed Mar 18 10:44:29 UTC 2015 - tchva...@suse.com
+
+- Fix build on SLE11
+
+---
+Tue Mar 17 14:39:51 UTC 2015 - tchva...@suse.com
+
+- Use python-devel instead of pkgconfig to build on sle11
+
+---
+Tue Mar 17 14:02:21 UTC 2015 - tchva...@suse.com
+
+- Add python-javapackages as requirement for main package
+
+---
+Tue Mar 17 13:35:17 UTC 2015 - tchva...@suse.com
+
+- Update requires on python packages to properly have all the needed
+ dependencies on runtime
+
+---
+Tue Mar 17 09:34:37 UTC 2015 - tchva...@suse.com
+
+- 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 - mailaen...@opensuse.org
+
+- 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
+
+---
+Mon Dec 8 13:02:05 UTC 2014 - fst...@suse.com
+
+- Added patch:
+ *
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2016-02-17 10:33:24
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
2015-04-02 16:00:53.0 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2016-02-17 12:13:11.0 +0100
@@ -1,0 +2,17 @@
+Fri Feb 12 15:21:42 UTC 2016 - toddrme2...@gmail.com
+
+- Add create_valid_xml_comments.patch
+ python-lxml 3.5.0 introduces validation for xml comments, and
+ one of the comments created in this package were not valid.
+ This patch fixes the problem. It backported from upstream and
+ should be in the next release.
+
https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9fc80ec377e89d
+
+---
+Mon Feb 8 20:23:42 UTC 2016 - tchva...@suse.com
+
+- Version update to 4.6.0:
+ * various bugfixes for maven tooling
+ * introduction to gradle-local package for gradle packaging
+
+---
Old:
javapackages-4.4.0.tar.xz
New:
create_valid_xml_comments.patch
javapackages-4.6.0.tar.xz
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.hEdzIY/_old 2016-02-17 12:13:11.0 +0100
+++ /var/tmp/diff_new_pack.hEdzIY/_new 2016-02-17 12:13:11.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package javapackages-tools
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,7 +17,7 @@
Name: javapackages-tools
-Version:4.4.0
+Version:4.6.0
Release:0
Summary:Macros and scripts for Java packaging support
License:BSD-3-Clause
@@ -30,6 +30,8 @@
#PATCH-FIX-SUSE: We put macros to /etc/rpm directly so make it reflected by
#the install script
Patch1: suse-macros-install-location.patch
+#PATCH-FIX-Upstream: create_valid_xml_comments.patch -- make comments that
pass python-lxml validation -
https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9fc80ec377e89d
+Patch2: create_valid_xml_comments.patch
BuildRequires: asciidoc
BuildRequires: dia
BuildRequires: fdupes
@@ -77,6 +79,16 @@
%description -n maven-local
This package provides macros and scripts to support packaging Maven artifacts.
+%package -n gradle-local
+Summary:Local mode for Gradle
+Group: Development/Languages/Java
+Requires: %{name} = %{version}
+Requires: javapackages-local = %{version}
+
+%description -n gradle-local
+This package implements local mode for Gradle, which allows artifact
+resolution using XMvn resolver.
+
%package -n ivy-local
Summary:Local mode for Apache Ivy
Group: Development/Languages/Java
@@ -116,6 +128,7 @@
%setup -q -n javapackages-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%configure --rpmconfigdir=%{_sysconfdir}/rpm/
@@ -144,6 +157,10 @@
%files -n maven-local -f files-maven
%defattr(-,root,root,-)
+%files -n gradle-local -f files-gradle
+%defattr(-,root,root)
+%dir %{_datadir}/gradle-local
+
%files -n ivy-local -f files-ivy
%defattr(-,root,root,-)
%dir %{_sysconfdir}/ant.d
++ create_valid_xml_comments.patch ++
>From 84211c0ee761e93ee507f5d37e9fc80ec377e89d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski
Date: Thu, 3 Dec 2015 06:58:58 +0100
Subject: [PATCH] Fix TravisCI test failure
---
java-utils/pom_editor.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
index eac7ab1..364a443 100644
--- a/java-utils/pom_editor.py
+++ b/java-utils/pom_editor.py
@@ -580,7 +580,7 @@ def pom_remove_parent(pom=None):
"""[POM location]"""
try:
pom.replace_xml(pom.xpath_query_element("/pom:project/pom:parent"),
-etree.Comment(" parent POM reference removed by
maintainer --> "))
+etree.Comment(" parent POM reference removed by
maintainer "))
except PomQueryNoMatch:
raise PomQueryNoMatch("POM doesn't specify parent.")
++ javapackages-4.4.0.tar.xz -> javapackages-4.6.0.tar.xz ++
10837 lines of diff (skipped)
++
commit javapackages-tools for openSUSE:Factory
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.0 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2015-04-02 16:00:53.0 +0200
@@ -1,0 +2,53 @@
+Wed Apr 1 08:40:57 UTC 2015 - tchva...@suse.com
+
+- Drop dependency over source-highlight as it causes build cycle
+
+---
+Tue Mar 31 10:28:12 UTC 2015 - tchva...@suse.com
+
+- Try to break buildcycle detected on Factory
+
+---
+Wed Mar 18 10:44:29 UTC 2015 - tchva...@suse.com
+
+- Fix build on SLE11
+
+---
+Tue Mar 17 14:39:51 UTC 2015 - tchva...@suse.com
+
+- Use python-devel instead of pkgconfig to build on sle11
+
+---
+Tue Mar 17 14:02:21 UTC 2015 - tchva...@suse.com
+
+- Add python-javapackages as requirement for main package
+
+---
+Tue Mar 17 13:35:17 UTC 2015 - tchva...@suse.com
+
+- Update requires on python packages to properly have all the needed
+ dependencies on runtime
+
+---
+Tue Mar 17 09:34:37 UTC 2015 - tchva...@suse.com
+
+- 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 - mailaen...@opensuse.org
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.syU5Cz/_new 2015-04-02 16:00:54.0 +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:
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2014-12-10 23:47:10
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-10-17 08:51:00.0 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2014-12-10 23:46:39.0 +0100
@@ -1,0 +2,9 @@
+Mon Dec 8 13:02:05 UTC 2014 - fst...@suse.com
+
+- Added patch:
+ * javapackages-2.0.1-java9.patch: create directories for java,
+so that ant build works
+- Add virtual provide jpackage-utils-java9 to be able to
+ distinguish the presence of java9 compatibility
+
+---
New:
javapackages-2.0.1-java9.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.wVTTs6/_old 2014-12-10 23:46:40.0 +0100
+++ /var/tmp/diff_new_pack.wVTTs6/_new 2014-12-10 23:46:40.0 +0100
@@ -37,6 +37,8 @@
# 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
@@ -57,6 +59,7 @@
Requires: python-xml
Provides: jpackage-utils = %{version}-%{release}
+Provides: jpackage-utils-java9
Obsoletes: jpackage-utils = 1.7.5
%description
@@ -110,6 +113,7 @@
%patch2 -p1
%endif
%patch3 -p1
+%patch4 -p1
%build
%{configure}
++ javapackages-2.0.1-java9.patch ++
--- javapackages-2.0.1/install 2013-07-26 09:25:31.0 +0200
+++ javapackages-2.0.1/install 2014-12-08 14:00:11.726036951 +0100
@@ -94,7 +94,7 @@
dir ${rpmconfigdir}/fileattrs
-for ver in 1.5.0 1.6.0 1.7.0 1.8.0; do
+for ver in 1.5.0 1.6.0 1.7.0 1.8.0 1.9.0; do
dir ${javadir}-${ver}
dir ${jnidir}-${ver}
done
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2014-10-17 08:50:38
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-03-21 13:31:18.0 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2014-10-17 08:51:00.0 +0200
@@ -1,0 +2,7 @@
+Thu Oct 16 11:12:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms
+- Added patches:
+ * javapackages-2.0.1-fix-bashisms.patch
+
+---
New:
javapackages-2.0.1-fix-bashisms.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.576RGw/_old 2014-10-17 08:51:01.0 +0200
+++ /var/tmp/diff_new_pack.576RGw/_new 2014-10-17 08:51:01.0 +0200
@@ -36,6 +36,7 @@
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
#BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -108,6 +109,7 @@
%if 0%{?suse_version} == 1110
%patch2 -p1
%endif
+%patch3 -p1
%build
%{configure}
++ javapackages-2.0.1-fix-bashisms.patch ++
diff -Ndur javapackages-2.0.1/bin/check-binary-files
javapackages-2.0.1-fix-bashisms/bin/check-binary-files
--- javapackages-2.0.1/bin/check-binary-files 2013-07-26 10:25:31.0
+0300
+++ javapackages-2.0.1-fix-bashisms/bin/check-binary-files 2014-10-13
02:46:47.702606713 +0300
@@ -108,8 +108,7 @@
while read line; do
- echo $line | grep ^% /dev/null
- if [ $? -eq 0 ] || [ $line = ]; then
+ if [ -z $line -o ${line#%} != $line ];
then
continue
fi
@@ -145,7 +144,7 @@
if [ ! -z $_ARCHIVE_FILE ]; then
rm -rf $_ARCHIVE_EXTRACTION_DIR
mkdir -p $_ARCHIVE_EXTRACTION_DIR
- pushd $_ARCHIVE_EXTRACTION_DIR /dev/null
+ cd $_ARCHIVE_EXTRACTION_DIR
tar xf $_WORKING_DIR/`basename $_ARCHIVE_FILE`
fi
@@ -159,18 +158,18 @@
_compression_flag=
- echo $_ARCHIVE_FILE | grep gz$ /dev/null
+ echo $_ARCHIVE_FILE | grep -q gz$
if [ $? -eq 0 ]; then
_compression_flag=z
fi
- echo $_ARCHIVE_FILE | grep bz2$ /dev/null
+ echo $_ARCHIVE_FILE | grep -q bz2$
if [ $? -eq 0 ]; then
_compression_flag=f
fi
tar cf$_compression_flag $_WORKING_DIR/$_arch_name-clean.$_arch_ext *
- popd /dev/null
+ cd - /dev/null
rm -rf $_ARCHIVE_EXTRACTION_DIR
fi
diff -Ndur javapackages-2.0.1/bin/clean-binary-files
javapackages-2.0.1-fix-bashisms/bin/clean-binary-files
--- javapackages-2.0.1/bin/clean-binary-files 2013-07-26 10:25:31.0
+0300
+++ javapackages-2.0.1-fix-bashisms/bin/clean-binary-files 2014-10-13
02:46:32.588605896 +0300
@@ -104,7 +104,7 @@
_old_ifs=$IFS
IFS='|'
- echo $1 | grep -E \\.jar$ /dev/null
+ echo $1 | grep -q -E \\.jar$
if [ $? -eq 0 ]; then
# Check if the item is in the exclusion list
@@ -162,7 +162,7 @@
IFS='|'
for filename in $_KEEP_LIST; do
- grep ^$filename $_ON_DISK_FILELIST /dev/null
+ grep -q ^$filename $_ON_DISK_FILELIST
if [ $? -gt 0 ]; then
echo Cannot find file $filename from exclusions list.
Aborting.
@@ -174,7 +174,7 @@
done
for filename in $_REMOVE_LIST; do
- grep ^$filename $_ON_DISK_FILELIST /dev/null
+ grep -q ^$filename $_ON_DISK_FILELIST
if [ $? -gt 0 ]; then
echo Cannot find file $filename from exclusions list.
Aborting.
@@ -257,7 +257,7 @@
return 0;
fi
- echo $1 | grep -E \\.jar$ /dev/null
+ echo $1 | grep -q -E \\.jar$
if [ ! $? -eq 0 ]; then
return 0
fi
@@ -342,8 +342,7 @@
while read line; do
- echo $line | grep ^% /dev/null
- if [ $? -eq 0 ] || [ $line = ]; then
+ if [ -z $line -o ${line#%} != $line ];
then
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2014-03-21 13:31:17
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-03-10 12:35:26.0 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2014-03-21 13:31:18.0 +0100
@@ -1,0 +2,7 @@
+Mon Mar 10 13:52:26 UTC 2014 - da...@darins.net
+
+- maven_depmap-no-attribute-exit.patch: SLES patch for ZipFile
+ having no attribute '__exit__' which was causing ecj build
+ failures
+
+---
New:
maven_depmap-no-attribute-exit.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.BZHjS0/_old 2014-03-21 13:31:18.0 +0100
+++ /var/tmp/diff_new_pack.BZHjS0/_new 2014-03-21 13:31:18.0 +0100
@@ -34,6 +34,9 @@
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
+
#BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asciidoc
@@ -102,6 +105,9 @@
%setup -q -n javapackages-%{version}
%patch0 -p1
%patch1 -p1
+%if 0%{?suse_version} == 1110
+%patch2 -p1
+%endif
%build
%{configure}
++ maven_depmap-no-attribute-exit.patch ++
--- javapackages-2.0.1/java-utils/maven_depmap.py 2014-03-10
09:25:02.081196397 -0400
+++ javapackages-2.0.1/java-utils/maven_depmap.py.mod 2014-03-10
09:25:35.499433928 -0400
@@ -236,9 +236,9 @@
# Add a file to a ZIP archive (or JAR, WAR, ...) unless the file
# already exists in the archive. Provided by Tomas Radej.
def append_if_missing(archive_name, file_name, file_contents):
-with ZipFile(archive_name, 'a') as archive:
-if file_name not in archive.namelist():
-archive.writestr(file_name, file_contents)
+archive = ZipFile(archive_name, 'a')
+if file_name not in archive.namelist():
+archive.writestr(file_name, file_contents)
# Inject pom.properties if JAR doesn't have one. This is necessary to
# identify the origin of JAR files that are present in the repository.
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2014-03-10 12:35:25
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
2013-12-06 14:40:53.0 +0100
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2014-03-10 12:35:26.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 6 13:54:16 UTC 2014 - da...@darins.net
+
+- set correct libxslt package when building for SLES
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.B9O8W6/_old 2014-03-10 12:35:26.0 +0100
+++ /var/tmp/diff_new_pack.B9O8W6/_new 2014-03-10 12:35:26.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package javapackages-tools
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -42,7 +42,11 @@
Requires: coreutils
# for xsltproc
+%if 0%{?suse_version} == 1110
+Requires: libxslt
+%else
Requires: libxslt-tools
+%endif
Requires: lua
Requires: python
# for xml.dom.minidom
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2013-12-06 13:51:48
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
2013-09-12 18:08:43.0 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2013-12-06 14:40:53.0 +0100
@@ -1,0 +2,7 @@
+Fri Nov 8 17:06:25 UTC 2013 - a...@ajaissle.de
+
+- BuildRequires xz
+- Remove '/etc/java' and '/usr/share/java' from file list (both owned by
system)
+- Url changed
+
+---
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.r0PvwO/_old 2013-12-06 14:40:53.0 +0100
+++ /var/tmp/diff_new_pack.r0PvwO/_new 2013-12-06 14:40:53.0 +0100
@@ -27,7 +27,7 @@
License:BSD-3-Clause
Group: Development/Languages/Java
-Url:https://fedorahosted.org/javapackages/
+Url:https://git.fedorahosted.org/cgit/javapackages.git/
Source0:
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
@@ -35,9 +35,10 @@
# PATCH-FIX-UPSTREAM Drain stdin in dependency generator
Patch1: depgen.patch
#BuildArch: noarch
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asciidoc
BuildRequires: xmlto
+BuildRequires: xz
Requires: coreutils
# for xsltproc
@@ -110,16 +111,19 @@
sed -e 's/.[17]$/.gz/' -e 's/.py$/*/' -i files-*
%if %{without mavenlocal}
-pushd %{buildroot}
+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
-popd
+cd -
%endif
+mv files-common files-common-old
+cat files-common-old | grep -v '^%dir /etc/java$' | grep -v '^%dir
/usr/share/java$' files-common
+
%files -f files-common
%defattr(-,root,root,-)
%doc LICENSE
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2013-09-12 18:08:41
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
2013-09-11 13:38:46.0 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2013-09-12 18:08:43.0 +0200
@@ -1,0 +2,5 @@
+Wed Sep 11 15:50:05 UTC 2013 - sch...@suse.de
+
+- depgen.patch: drain stdin in dependency generator
+
+---
New:
depgen.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.8OxwYy/_old 2013-09-12 18:08:44.0 +0200
+++ /var/tmp/diff_new_pack.8OxwYy/_new 2013-09-12 18:08:44.0 +0200
@@ -32,6 +32,8 @@
#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
#BuildArch: noarch
BuildRequires: asciidoc
@@ -94,6 +96,7 @@
%prep
%setup -q -n javapackages-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{configure}
++ depgen.patch ++
Index: javapackages-2.0.1/depgenerators/javadoc.req
===
--- javapackages-2.0.1.orig/depgenerators/javadoc.req
+++ javapackages-2.0.1/depgenerators/javadoc.req
@@ -1,3 +1,4 @@
#!/bin/sh
+cat /dev/null
# always required for javadocs
echo jpackage-utils
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit javapackages-tools for openSUSE:Factory
Hello community,
here is the log from the commit of package javapackages-tools for
openSUSE:Factory checked in at 2013-09-11 13:38:45
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
2013-07-16 16:40:40.0 +0200
+++
/work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes
2013-09-11 13:38:46.0 +0200
@@ -1,0 +2,18 @@
+Wed Aug 21 07:56:17 UTC 2013 - mvysko...@suse.com
+
+- update to 2.0.1
+ * Fix creation of artifact aliases, resolves: rhbz#988462
+- Update to upstream version 2.0.0
+ * Merge functionality of jpackage-utils
+ * Provide and obsolete jpackage-utils
+ * %%add_maven_depmap macro now injects pom.properties to every JAR
+ * %%add_to_maven_depmap and %%update_maven_depmap macros were removed
+ * maven2jpp-mapdeps.xsl template has been removed
+ * Macros related to installation of icons and desktop files were removed
+ * 14 new manual pages were added
+ * Documentation specific to JPackage was removed
+ * Add BuildRequires: asciidoc, xmlto
+ * Add lua to Requires
+ * Add python-xml to Requires for xml.dom.minidom
+
+---
Old:
javapackages-0.15.0.tar.xz
New:
javapackages-2.0.1.tar.xz
suse-use-libdir.patch
Other differences:
--
++ javapackages-tools.spec ++
--- /var/tmp/diff_new_pack.88gwOW/_old 2013-09-11 13:38:46.0 +0200
+++ /var/tmp/diff_new_pack.88gwOW/_new 2013-09-11 13:38:46.0 +0200
@@ -15,12 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
# 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:0.15.0
+Version:2.0.1
Release:0
Summary:Macros and scripts for Java packaging support
License:BSD-3-Clause
@@ -28,16 +29,24 @@
Url:https://fedorahosted.org/javapackages/
Source0:
https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
-BuildArch: noarch
-
-BuildRequires: jpackage-utils
-
-Requires: libxslt
+#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
+#BuildArch: noarch
+
+BuildRequires: asciidoc
+BuildRequires: xmlto
+
+Requires: coreutils
+# for xsltproc
+Requires: libxslt-tools
+Requires: lua
Requires: python
+# for xml.dom.minidom
+Requires: python-xml
-Requires: jpackage-utils = 1.7.5
-# javapackages were a part of jpackage-utils, so let support an auto update
-Provides: jpackage-utils:%{_rpmconfigdir}/fileattrs/*.attr
+Provides: jpackage-utils = %{version}-%{release}
+Obsoletes: jpackage-utils = 1.7.5
%description
This package provides macros and scripts to support Java packaging.
@@ -82,82 +91,35 @@
This package provides macros and scripts to support packaging Maven artifacts.
%endif
-
%prep
%setup -q -n javapackages-%{version}
+%patch0 -p1
%build
+%{configure}
+./build
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-utils
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/maven
-install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven-effective-poms
-%if %{with mavenlocal}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/xmvn
-%endif
-install -d -m 755 $RPM_BUILD_ROOT%{_mavendepmapfragdir}
-
-install -p -m 755 depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -p -m 755 depgenerators/maven.req $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -p -m 755 depgenerators/osgi.prov $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -p -m 755 depgenerators/osgi.req $RPM_BUILD_ROOT%{_rpmconfigdir}
-install -p -m 755 depgenerators/javadoc.req $RPM_BUILD_ROOT%{_rpmconfigdir}
-# Add the maven poms file attribute entry (rpm = 4.9.0)
-install -p -m 644 depgenerators/fileattrs/maven.attr
$RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-install -p -m 644 depgenerators/fileattrs/osgi.attr
$RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-install -p -m 644 depgenerators/fileattrs/javadoc.attr
$RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs
-install -p -m 644 macros.* $RPM_BUILD_ROOT%{_sysconfdir}/rpm
-%if %{with mavenlocal}
-install -p -m 644 metadata/*.xml
commit javapackages-tools for openSUSE:Factory
Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2013-09-11 16:38:06 Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New) Package is javapackages-tools Changes: Other differences: -- ++ javapackages-tools.spec ++ --- /var/tmp/diff_new_pack.rLkSdr/_old 2013-09-11 16:38:14.0 +0200 +++ /var/tmp/diff_new_pack.rLkSdr/_new 2013-09-11 16:38:14.0 +0200 @@ -100,6 +100,9 @@ ./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-* -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
