diff --git a/javapackages-0.15.0.tar.xz b/javapackages-0.15.0.tar.xz deleted file mode 100644 index f4b25d4..0000000 --- a/javapackages-0.15.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ed12387479e72bf10a3ca52616bc34cc98649660c6d29962a5089a995ee4c40 -size 56864 diff --git a/javapackages-2.0.1.tar.xz b/javapackages-2.0.1.tar.xz new file mode 100644 index 0000000..7f19ab5 --- /dev/null +++ b/javapackages-2.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd8159ac1cd2a04c7d704dfc6a9a5e660c8cffc49a4bcd565d216f27a7c62d4c +size 85376 diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 16ab10d..0d3b7d7 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +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 diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 1a2941c..ea1c9b0 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -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 @@ Group: Development/Languages/Java Url: https://fedorahosted.org/javapackages/ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz -BuildArch: noarch +#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: jpackage-utils +BuildRequires: asciidoc +BuildRequires: xmlto -Requires: libxslt +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 @@ Requires: maven-surefire-provider-testng 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 +sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* -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 $RPM_BUILD_ROOT%{_sysconfdir}/maven -%else -rm -f %{buildroot}/%{_sysconfdir}/rpm/macros.xmvn -%endif -install -p -m 644 scripts/maven_depmap.py $RPM_BUILD_ROOT%{_javadir}-utils -install -p -m 644 scripts/pom_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils -%if %{with mavenlocal} -install -p -m 644 scripts/xmvn_config_editor.sh $RPM_BUILD_ROOT%{_javadir}-utils -install -p -m 755 scripts/mvn-* $RPM_BUILD_ROOT%{_bindir} - -install -p -m 644 configs/configuration*.xml $RPM_BUILD_ROOT%{_datadir}/xmvn -ln -sf %{_datadir}/xmvn/configuration-19.xml $RPM_BUILD_ROOT%{_datadir}/xmvn/configuration.xml +%if %{without mavenlocal} +pushd %{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 %endif -install -p -m 755 depmap.xml $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name}-depmap.xml - -%if %{with mavenlocal} -# On Fedora 18 we don't want to install mvn-local and mvn-rpmbuild -# scripts as they are already provided by maven package. -%if 0%{?fedora} == 18 -rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild} -%endif -%endif - -%files +%files -f files-common %defattr(-,root,root,-) %doc LICENSE -%dir %{_rpmconfigdir}/fileattrs -%dir %{_datadir}/maven-effective-poms -%{_rpmconfigdir}/fileattrs/*.attr -%{_rpmconfigdir}/*.prov -%{_rpmconfigdir}/*.req -# The python file is compiled producing .pyc and .pyo, which we need to include -%{_javadir}-utils/maven_depmap.py* -%{_javadir}-utils/pom_editor.sh -%{_sysconfdir}/rpm/macros.fjava -%{_mavendepmapfragdir}/* %if %{with mavenlocal} -%files -n maven-local -%defattr(-,root,root,-) -%dir %{_datadir}/xmvn -%{_javadir}-utils/xmvn_config_editor.sh -%{_sysconfdir}/rpm/macros.xmvn -%{_sysconfdir}/maven/*.xml -%{_bindir}/mvn-* -%{_datadir}/xmvn/configuration*.xml +%files -n maven-local -f files-maven %endif %changelog diff --git a/suse-use-libdir.patch b/suse-use-libdir.patch new file mode 100644 index 0000000..f121391 --- /dev/null +++ b/suse-use-libdir.patch @@ -0,0 +1,74 @@ +--- + configure | 2 ++ + etc/macros.jpackage | 12 ++++++------ + 2 files changed, 8 insertions(+), 6 deletions(-) + +Index: javapackages-2.0.1/etc/macros.jpackage +=================================================================== +--- javapackages-2.0.1.orig/etc/macros.jpackage ++++ javapackages-2.0.1/etc/macros.jpackage +@@ -13,22 +13,22 @@ + # + # Root directory where all Java VMs/SDK/JREs are installed. + # +-%_jvmdir %{_prefix}/lib/jvm ++%_jvmdir %{_libdir}/jvm + + # + # Root directory where all Java VMs/SDK/JREs expose their jars + # +-%_jvmjardir %{_prefix}/lib/jvm-exports ++%_jvmjardir %{_libdir}/jvm-exports + + # + # Root directory for all Java VM/SDK/JRE's private things. + # +-%_jvmprivdir %{_prefix}/lib/jvm-private ++%_jvmprivdir %{_libdir}/jvm-private + + # + # Root directory for all architecture dependent parts of Java VM/SDK/JRE's + # +-%_jvmlibdir %{_prefix}/lib/jvm ++%_jvmlibdir %{_libdir}/jvm + + # + # Root directory for all architecture independent parts of Java VM/SDK/JRE's +@@ -43,7 +43,7 @@ + # + # Root directory for all common architecture dependent parts of Java VM/SDK/JRE's + # +-%_jvmcommonlibdir %{_prefix}/lib/jvm-commmon ++%_jvmcommonlibdir %{_libdir}/jvm-commmon + + # + # Root directory for all common architecture independent parts of Java VM/SDK/JRE's +@@ -81,7 +81,7 @@ + # - jars for Java standard x.y.z (usually symlinks to %{_jnidir}-ext) + # To simplify things only %{_jnidir} is defined. + # +-%_jnidir %{_prefix}/lib/java ++%_jnidir %{_libdir}/java + + # + # Root directory where all javadoc is installed. Also already in RH macros. +Index: javapackages-2.0.1/configure +=================================================================== +--- javapackages-2.0.1.orig/configure ++++ javapackages-2.0.1/configure +@@ -39,6 +39,7 @@ mandir + prefix + sysconfdir + rpmconfigdir ++libdir + + javadir + javadocdir +@@ -68,6 +69,7 @@ test -z "${datadir}" && datadir="${prefi + test -z "${mandir}" && mandir="${datadir}/man" + test -z "${sysconfdir}" && sysconfdir="${prefix}/etc" + test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" ++test -z "${libdir}" && libdir="${prefix}/lib" + + eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' etc/macros.jpackage) +