- Switch to multibuild layout
- Update to version 5.0.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 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=45
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
5cc9d29b0d
commit
6eb3784f6b
3
_multibuild
Normal file
3
_multibuild
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<multibuild>
|
||||||
|
<package>extras</package>
|
||||||
|
</multibuild>
|
||||||
2
_service
2
_service
@ -4,7 +4,7 @@
|
|||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="changesgenerate">enable</param>
|
<param name="changesgenerate">enable</param>
|
||||||
<param name="filename">javapackages</param>
|
<param name="filename">javapackages</param>
|
||||||
<param name="versionformat">5.0.0+git%cd.%h</param>
|
<param name="versionformat">5.2.0+git%cd.%h</param>
|
||||||
</service>
|
</service>
|
||||||
<service mode="disabled" name="recompress">
|
<service mode="disabled" name="recompress">
|
||||||
<param name="file">*.tar</param>
|
<param name="file">*.tar</param>
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:670722d9bd53622a73b9a41312bf965601ced2bca5ea17bfa9afb758173a15fc
|
|
||||||
size 118040
|
|
||||||
3
javapackages-5.2.0+git20180620.70fa2258.tar.xz
Normal file
3
javapackages-5.2.0+git20180620.70fa2258.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:fb6483258ffcae21358c77e7db34ff179d67f05d64e26226aed290f302fc6e82
|
||||||
|
size 116692
|
||||||
@ -1,201 +0,0 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Mon Jan 22 09:31:20 UTC 2018 - tchvatal@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
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Wed May 24 13:39:01 UTC 2017 - tchvatal@suse.com
|
|
||||||
|
|
||||||
- Fix typo in suse-use-libdir.patch
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri May 19 10:26:41 UTC 2017 - tchvatal@suse.com
|
|
||||||
|
|
||||||
- Fix url to correct one https://github.com/fedora-java/javapackages
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu May 18 20:11:39 UTC 2017 - tchvatal@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 - tchvatal@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 - toddrme2178@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 - tchvatal@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 - tchvatal@suse.com
|
|
||||||
|
|
||||||
- Drop dependency over source-highlight as it causes build cycle
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Mar 31 10:28:12 UTC 2015 - tchvatal@suse.com
|
|
||||||
|
|
||||||
- Try to break buildcycle detected on Factory
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Wed Mar 18 10:44:29 UTC 2015 - tchvatal@suse.com
|
|
||||||
|
|
||||||
- Fix build on SLE11
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Mar 17 14:39:51 UTC 2015 - tchvatal@suse.com
|
|
||||||
|
|
||||||
- Use python-devel instead of pkgconfig to build on sle11
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Mar 17 14:02:21 UTC 2015 - tchvatal@suse.com
|
|
||||||
|
|
||||||
- Add python-javapackages as requirement for main package
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Mar 17 13:35:17 UTC 2015 - tchvatal@suse.com
|
|
||||||
|
|
||||||
- Update requires on python packages to properly have all the needed
|
|
||||||
dependencies on runtime
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Mar 17 09:34:37 UTC 2015 - tchvatal@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 - mailaender@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 - fstrba@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
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Oct 16 11:12:00 UTC 2014 - Led <ledest@gmail.com>
|
|
||||||
|
|
||||||
- fix bashisms
|
|
||||||
- Added patches:
|
|
||||||
* javapackages-2.0.1-fix-bashisms.patch
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Mar 10 13:52:26 UTC 2014 - darin@darins.net
|
|
||||||
|
|
||||||
- maven_depmap-no-attribute-exit.patch: SLES patch for ZipFile
|
|
||||||
having no attribute '__exit__' which was causing ecj build
|
|
||||||
failures
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Mar 6 13:54:16 UTC 2014 - darin@darins.net
|
|
||||||
|
|
||||||
- set correct libxslt package when building for SLES
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Nov 8 17:06:25 UTC 2013 - aj@ajaissle.de
|
|
||||||
|
|
||||||
- BuildRequires xz
|
|
||||||
- Remove '/etc/java' and '/usr/share/java' from file list (both owned by system)
|
|
||||||
- Url changed
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Wed Sep 11 15:50:05 UTC 2013 - schwab@suse.de
|
|
||||||
|
|
||||||
- depgen.patch: drain stdin in dependency generator
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Wed Aug 21 07:56:17 UTC 2013 - mvyskocil@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
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Jul 12 09:35:17 UTC 2013 - mvyskocil@suse.com
|
|
||||||
|
|
||||||
- make maven-local package build optional to not add unsatisfied
|
|
||||||
dependencies to Factory
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Jul 2 14:06:39 UTC 2013 - mvyskocil@suse.com
|
|
||||||
|
|
||||||
- Create javapackages-tools 0.15.0 from fc20
|
|
||||||
* Added depmap for tools.jar
|
|
||||||
* Added support for versioned autorequires
|
|
||||||
* New plugin metadata from Maven Central
|
|
||||||
* move to independent package from jpackage-utils
|
|
||||||
@ -1,191 +0,0 @@
|
|||||||
#
|
|
||||||
# spec file for package javapackages-tools-extras
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
# upon. The license for this file, and modifications and additions to the
|
|
||||||
# file, is the same license as for the pristine package itself (unless the
|
|
||||||
# license for the pristine package is not an Open Source License, in which
|
|
||||||
# case the license is the MIT License). An "Open Source License" is a
|
|
||||||
# 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/
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
%bcond_without python
|
|
||||||
Name: javapackages-tools-extras
|
|
||||||
Version: 5.0.0+git20180104.9367c8f6
|
|
||||||
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
|
|
||||||
#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
|
|
||||||
BuildRequires: asciidoc
|
|
||||||
BuildRequires: fdupes
|
|
||||||
BuildRequires: rpm
|
|
||||||
BuildRequires: xmlto
|
|
||||||
BuildRequires: xz
|
|
||||||
# Used on too many places
|
|
||||||
Provides: jpackage-utils = %{version}
|
|
||||||
Obsoletes: %{name}-doc
|
|
||||||
Obsoletes: jpackage-utils < %{version}
|
|
||||||
%if %{with python}
|
|
||||||
BuildRequires: python3-lxml
|
|
||||||
BuildRequires: python3-nose
|
|
||||||
BuildRequires: python3-setuptools
|
|
||||||
BuildRequires: python3-six
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
|
||||||
This package provides macros and scripts to support Java packaging.
|
|
||||||
|
|
||||||
%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
|
|
||||||
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.
|
|
||||||
|
|
||||||
%package -n ivy-local
|
|
||||||
Summary: Local mode for Apache Ivy
|
|
||||||
Group: Development/Languages/Java
|
|
||||||
Requires: ant
|
|
||||||
Requires: javapackages-local = %{version}
|
|
||||||
Requires: javapackages-tools = %{version}
|
|
||||||
|
|
||||||
%description -n ivy-local
|
|
||||||
This package implements 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
|
|
||||||
Group: Development/Languages/Java
|
|
||||||
Requires: python3-lxml
|
|
||||||
Requires: python3-six
|
|
||||||
Obsoletes: python-javapackages
|
|
||||||
|
|
||||||
%description -n python3-javapackages
|
|
||||||
Module for handling, querying and manipulating of various files for Java
|
|
||||||
packaging in Linux distributions
|
|
||||||
|
|
||||||
%package -n javapackages-local
|
|
||||||
Summary: Non-essential macros and scripts for Java packaging support
|
|
||||||
Group: Development/Languages/Java
|
|
||||||
Requires: javapackages-tools = %{version}
|
|
||||||
Requires: python3-javapackages = %{version}
|
|
||||||
|
|
||||||
%description -n javapackages-local
|
|
||||||
This package provides non-essential macros and scripts to support Java packaging.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q -n javapackages-%{version}
|
|
||||||
%autopatch -p1
|
|
||||||
|
|
||||||
%build
|
|
||||||
%configure \
|
|
||||||
%if %{with python}
|
|
||||||
--pyinterpreter=%{_bindir}/python3
|
|
||||||
%else
|
|
||||||
--pyinterpreter=%{nil}
|
|
||||||
%endif
|
|
||||||
./build
|
|
||||||
%if %{with python}
|
|
||||||
pushd python
|
|
||||||
python3 setup.py build
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
|
||||||
./install
|
|
||||||
sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
|
|
||||||
|
|
||||||
%if %{with python}
|
|
||||||
pushd python
|
|
||||||
python3 setup.py install --root %{buildroot}
|
|
||||||
popd
|
|
||||||
# kill all the common files
|
|
||||||
files="
|
|
||||||
%{_bindir}/build-classpath
|
|
||||||
%{_bindir}/build-classpath-directory
|
|
||||||
%{_bindir}/build-jar-repository
|
|
||||||
%{_bindir}/check-binary-files
|
|
||||||
%{_bindir}/clean-binary-files
|
|
||||||
%{_bindir}/create-jar-links
|
|
||||||
%{_bindir}/diff-jars
|
|
||||||
%{_bindir}/find-jar
|
|
||||||
%{_bindir}/rebuild-jar-repository
|
|
||||||
%{_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
|
|
||||||
%{_prefix}/lib/rpm/macros.d/macros.jpackage
|
|
||||||
%{_mandir}/man1/build-classpath.1
|
|
||||||
%{_mandir}/man1/build-jar-repository.1
|
|
||||||
%{_mandir}/man1/diff-jars.1
|
|
||||||
%{_mandir}/man1/rebuild-jar-repository.1
|
|
||||||
%{_mandir}/man1/shade-jar.1
|
|
||||||
%{_mandir}/man1/find-jar.1
|
|
||||||
%{_datadir}/maven-metadata/javapackages-metadata.xml
|
|
||||||
%{_datadir}/xmvn/configuration.xml
|
|
||||||
"
|
|
||||||
for i in $files; do
|
|
||||||
rm -rf %{buildroot}/$i
|
|
||||||
done
|
|
||||||
%endif
|
|
||||||
|
|
||||||
rm -rf %{buildroot}%{_datadir}/fedora-review/
|
|
||||||
|
|
||||||
%fdupes %{buildroot}/%{_prefix}
|
|
||||||
|
|
||||||
%check
|
|
||||||
./check
|
|
||||||
|
|
||||||
%if !%{with python}
|
|
||||||
%files -f files-common
|
|
||||||
%doc LICENSE
|
|
||||||
%else
|
|
||||||
%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
|
|
||||||
|
|
||||||
%files -n ivy-local -f files-ivy
|
|
||||||
%dir %{_sysconfdir}/ant.d
|
|
||||||
|
|
||||||
%files -n python3-javapackages
|
|
||||||
%doc LICENSE
|
|
||||||
%{python3_sitelib}/javapackages*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
@ -1,3 +1,30 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 24 14:09:47 UTC 2018 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Switch to multibuild layout
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 24 13:45:21 UTC 2018 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Update to version 5.0.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
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 22 09:31:20 UTC 2018 - tchvatal@suse.com
|
Mon Jan 22 09:31:20 UTC 2018 - tchvatal@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -16,14 +16,23 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%global flavor @BUILD_FLAVOR@%{nil}
|
||||||
|
%if "%{flavor}" == "extras"
|
||||||
|
%bcond_without python
|
||||||
|
%else
|
||||||
%bcond_with python
|
%bcond_with python
|
||||||
|
%endif
|
||||||
|
%if %{with python}
|
||||||
|
Name: javapackages-tools-%{flavor}
|
||||||
|
%else
|
||||||
Name: javapackages-tools
|
Name: javapackages-tools
|
||||||
Version: 5.0.0+git20180104.9367c8f6
|
%endif
|
||||||
|
Version: 5.2.0+git20180620.70fa2258
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Macros and scripts for Java packaging support
|
Summary: Macros and scripts for Java packaging support
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Development/Languages/Java
|
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
|
# Latest tag is missing, quite often needs patches, use service
|
||||||
Source: javapackages-%{version}.tar.xz
|
Source: javapackages-%{version}.tar.xz
|
||||||
#PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits
|
#PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits
|
||||||
@ -40,6 +49,7 @@ BuildRequires: xz
|
|||||||
Provides: jpackage-utils = %{version}
|
Provides: jpackage-utils = %{version}
|
||||||
Obsoletes: %{name}-doc
|
Obsoletes: %{name}-doc
|
||||||
Obsoletes: jpackage-utils < %{version}
|
Obsoletes: jpackage-utils < %{version}
|
||||||
|
BuildArch: noarch
|
||||||
%if %{with python}
|
%if %{with python}
|
||||||
BuildRequires: python3-lxml
|
BuildRequires: python3-lxml
|
||||||
BuildRequires: python3-nose
|
BuildRequires: python3-nose
|
||||||
@ -146,7 +156,8 @@ files="
|
|||||||
%{_datadir}/java-utils/java-functions
|
%{_datadir}/java-utils/java-functions
|
||||||
%{_datadir}/java-utils/java-wrapper
|
%{_datadir}/java-utils/java-wrapper
|
||||||
%{_datadir}/java-utils/scl-enable
|
%{_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-classpath.1
|
||||||
%{_mandir}/man1/build-jar-repository.1
|
%{_mandir}/man1/build-jar-repository.1
|
||||||
%{_mandir}/man1/diff-jars.1
|
%{_mandir}/man1/diff-jars.1
|
||||||
@ -169,8 +180,11 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
|
|||||||
./check
|
./check
|
||||||
|
|
||||||
%if !%{with python}
|
%if !%{with python}
|
||||||
%files -f files-common
|
%files -f files-tools
|
||||||
%doc LICENSE
|
%license LICENSE
|
||||||
|
%dir %{_datadir}/maven-metadata
|
||||||
|
# The bellow one is split in fedora, we don't want to do that
|
||||||
|
%{_libexecdir}/rpm/macros.d/macros.javapackages-filesystem
|
||||||
%else
|
%else
|
||||||
%files -n javapackages-local -f files-local
|
%files -n javapackages-local -f files-local
|
||||||
%dir %{_datadir}/java-utils
|
%dir %{_datadir}/java-utils
|
||||||
@ -184,7 +198,7 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
|
|||||||
%dir %{_sysconfdir}/ant.d
|
%dir %{_sysconfdir}/ant.d
|
||||||
|
|
||||||
%files -n python3-javapackages
|
%files -n python3-javapackages
|
||||||
%doc LICENSE
|
%license LICENSE
|
||||||
%{python3_sitelib}/javapackages*
|
%{python3_sitelib}/javapackages*
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|||||||
@ -1,13 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
master="javapackages-tools.spec"
|
|
||||||
slave="javapackages-tools-extras.spec"
|
|
||||||
cp $master $slave
|
|
||||||
sed -i \
|
|
||||||
-e 's:%bcond_with python:%bcond_without python:' \
|
|
||||||
-e 's/Name: javapackages-tools/Name: javapackages-tools-extras/' \
|
|
||||||
$slave
|
|
||||||
|
|
||||||
# changelogs
|
|
||||||
|
|
||||||
cp javapackages-tools.changes javapackages-tools-extras.changes
|
|
||||||
@ -1,18 +1,18 @@
|
|||||||
Index: javapackages-5.0.0+git20180104.9367c8f6/build
|
Index: javapackages-5.2.0+git20180620.70fa2258/build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- javapackages-5.0.0+git20180104.9367c8f6.orig/build
|
--- javapackages-5.2.0+git20180620.70fa2258.orig/build
|
||||||
+++ javapackages-5.0.0+git20180104.9367c8f6/build
|
+++ javapackages-5.2.0+git20180620.70fa2258/build
|
||||||
@@ -117,5 +117,3 @@ manpage build-classpath
|
@@ -117,5 +117,3 @@ manpage build-classpath
|
||||||
manpage build-jar-repository
|
manpage build-jar-repository
|
||||||
manpage rebuild-jar-repository
|
manpage rebuild-jar-repository
|
||||||
manpage shade-jar
|
manpage shade-jar
|
||||||
-
|
-
|
||||||
-(cd ./python && "${pyinterpreter}" setup.py build)
|
-(cd ./python && "${pyinterpreter}" setup.py build)
|
||||||
Index: javapackages-5.0.0+git20180104.9367c8f6/install
|
Index: javapackages-5.2.0+git20180620.70fa2258/install
|
||||||
===================================================================
|
===================================================================
|
||||||
--- javapackages-5.0.0+git20180104.9367c8f6.orig/install
|
--- javapackages-5.2.0+git20180620.70fa2258.orig/install
|
||||||
+++ javapackages-5.0.0+git20180104.9367c8f6/install
|
+++ javapackages-5.2.0+git20180620.70fa2258/install
|
||||||
@@ -242,8 +242,3 @@ exec >files-gradle
|
@@ -253,8 +253,3 @@ exec >files-gradle
|
||||||
inst_exec target/gradle-local "${bindir}"
|
inst_exec target/gradle-local "${bindir}"
|
||||||
inst_data gradle/init.gradle "${datadir}/gradle-local"
|
inst_data gradle/init.gradle "${datadir}/gradle-local"
|
||||||
inst_data target/gradle_build.7 "${mandir}/man7"
|
inst_data target/gradle_build.7 "${mandir}/man7"
|
||||||
@ -21,10 +21,10 @@ Index: javapackages-5.0.0+git20180104.9367c8f6/install
|
|||||||
-(cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2
|
-(cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2
|
||||||
-echo "${prefix}/lib/python?.?/site-packages/javapackages"
|
-echo "${prefix}/lib/python?.?/site-packages/javapackages"
|
||||||
-echo "${prefix}/lib/python?.?/site-packages/javapackages-*.egg-info"
|
-echo "${prefix}/lib/python?.?/site-packages/javapackages-*.egg-info"
|
||||||
Index: javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
|
Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- javapackages-5.0.0+git20180104.9367c8f6.orig/configure-base.sh
|
--- javapackages-5.2.0+git20180620.70fa2258.orig/configure-base.sh
|
||||||
+++ javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
|
+++ javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
|
||||||
@@ -57,7 +57,6 @@ test -z "${rpmconfigdir}" && rpmconfigdi
|
@@ -57,7 +57,6 @@ test -z "${rpmconfigdir}" && rpmconfigdi
|
||||||
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
|
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
|
||||||
|
|
||||||
@ -32,4 +32,4 @@ Index: javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
|
|||||||
-test -z "${pyinterpreter}" && pyinterpreter=$(which python)
|
-test -z "${pyinterpreter}" && pyinterpreter=$(which python)
|
||||||
test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"
|
test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"
|
||||||
|
|
||||||
eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.jpackage)
|
eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem)
|
||||||
|
|||||||
@ -6,10 +6,30 @@ Subject: [PATCH] SUSE does store jvm related things in libdir
|
|||||||
macros.d/macros.jpackage | 12 ++++++------
|
macros.d/macros.jpackage | 12 ++++++------
|
||||||
2 files changed, 8 insertions(+), 6 deletions(-)
|
2 files changed, 8 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
Index: javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
|
Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- javapackages-5.0.0+git20180104.9367c8f6.orig/macros.d/macros.jpackage
|
--- javapackages-5.2.0+git20180620.70fa2258.orig/configure-base.sh
|
||||||
+++ javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
|
+++ javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
|
||||||
|
@@ -14,6 +14,7 @@ sysconfdir
|
||||||
|
root_sysconfdir
|
||||||
|
rpmconfigdir
|
||||||
|
rpmmacrodir
|
||||||
|
+libdir
|
||||||
|
|
||||||
|
m2home
|
||||||
|
|
||||||
|
@@ -51,6 +52,7 @@ test -z "${mandir}" && mandir="${datadir
|
||||||
|
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 "${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
|
||||||
@@ -13,17 +13,17 @@
|
@@ -13,17 +13,17 @@
|
||||||
#
|
#
|
||||||
# Root directory where all Java VMs/SDK/JREs are installed.
|
# Root directory where all Java VMs/SDK/JREs are installed.
|
||||||
@ -49,23 +69,3 @@ Index: javapackages-5.0.0+git20180104.9367c8f6/macros.d/macros.jpackage
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Root directory where all javadoc is installed. Also already in RH macros.
|
# Root directory where all javadoc is installed. Also already in RH macros.
|
||||||
Index: javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
|
|
||||||
===================================================================
|
|
||||||
--- javapackages-5.0.0+git20180104.9367c8f6.orig/configure-base.sh
|
|
||||||
+++ javapackages-5.0.0+git20180104.9367c8f6/configure-base.sh
|
|
||||||
@@ -14,6 +14,7 @@ sysconfdir
|
|
||||||
root_sysconfdir
|
|
||||||
rpmconfigdir
|
|
||||||
rpmmacrodir
|
|
||||||
+libdir
|
|
||||||
|
|
||||||
m2home
|
|
||||||
|
|
||||||
@@ -51,6 +52,7 @@ test -z "${mandir}" && mandir="${datadir
|
|
||||||
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 "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
|
|
||||||
test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user