Hello community, here is the log from the commit of package jpackage-utils for openSUSE:Factory checked in at 2013-07-04 17:58:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jpackage-utils (Old) and /work/SRC/openSUSE:Factory/.jpackage-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jpackage-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/jpackage-utils/jpackage-utils.changes 2012-05-21 08:05:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jpackage-utils.new/jpackage-utils.changes 2013-07-04 17:58:46.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 2 13:49:21 UTC 2013 - [email protected] + +- drop javapackages from jpackage-utils +- don't own /usr/share/java (owned by filesystem) + +------------------------------------------------------------------- Old: ---- javapackages-0.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jpackage-utils.spec ++++++ --- /var/tmp/diff_new_pack.n0Wa1W/_old 2013-07-04 17:58:46.000000000 +0200 +++ /var/tmp/diff_new_pack.n0Wa1W/_new 2013-07-04 17:58:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package jpackage-utils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -19,8 +19,6 @@ %define distver 1.7 %define section free -%global fj_version 0.3.1 - Name: jpackage-utils Version: 1.7.5 Release: 0 @@ -32,8 +30,6 @@ Source1: jpackage-utils-1.7.5-man-pages.tar.bz2 Source2: abs2rel.sh Source3: abs2rel.lua -# fedora specific macros -Source8: https://fedorahosted.org/released/javapackages/javapackages-%{fj_version}.tar.xz Source1000: jpackage-utils-rpmlintrc Source1001: README.SUSE #PATCH-FIX-SUSE: skip all macros which are in aaa_base package @@ -56,15 +52,11 @@ Requires: python-xml Requires: sed -# Fedora have splitted it into separate package, which seems not needed -# atm in SUSE, so let use Provides to stay compatible -Provides: javapackages-tools = %{fj_version} - %description Utilities for the JPackage project <http://www.jpackage.org/>. %prep -%setup -q -b 1 -a 8 +%setup -q -b 1 %patch0 -b .sav %patch1 -p1 @@ -74,7 +66,7 @@ %patch1000 -p1 -cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} . +cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} . cp %{SOURCE1001} doc @@ -171,27 +163,6 @@ install -dm 0755 ${RPM_BUILD_ROOT}%{_javadir}-utils/xml install -pm 644 xml/* ${RPM_BUILD_ROOT}%{_javadir}-utils/xml -# imported fedora-specific extensions -pushd javapackages-%{fj_version} -# Add the provides script -install -m0755 -D depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}/maven.prov -install -m0755 -D depgenerators/maven.req $RPM_BUILD_ROOT%{_rpmconfigdir}/maven.req -install -m0755 -D depgenerators/osgi.prov $RPM_BUILD_ROOT%{_rpmconfigdir}/osgi.prov -install -m0755 -D depgenerators/osgi.req $RPM_BUILD_ROOT%{_rpmconfigdir}/osgi.req - -#XXX: skip the .req generators as we cannot fulfill deps in SUSE -sed -i '/requires/d' depgenerators/fileattrs/*attr - -# Add the maven poms file attribute entry (rpm >= 4.9.0) -install -m0644 -D depgenerators/fileattrs/maven.attr \ - $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/maven.attr -install -m0644 -D depgenerators/fileattrs/osgi.attr \ - $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/osgi.attr - -install -pm 644 macros.fjava ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm -install -pm 644 scripts/maven_depmap.py ${RPM_BUILD_ROOT}%{_javadir}-utils/ -popd - cat <<EOF > %{name}-%{version}.files %{_bindir}/* %{_mandir}/man1/* @@ -207,7 +178,7 @@ %dir ${_jvmcommonlibdir} %dir ${_jvmcommondatadir} %dir ${_jvmcommonsysconfdir} -%dir %{_javadir} +# % dir %{_javadir} %dir %{_javadir}-* %dir %{_jnidir} %dir %{_jnidir}-* @@ -216,15 +187,10 @@ %dir ${_mavendepmapdir} %dir ${_mavendepmapfragdir} %{_javadir}-utils/* -%{_rpmconfigdir}/*.prov -%{_rpmconfigdir}/*.req -%dir %{_rpmconfigdir}/fileattrs -%{_rpmconfigdir}/fileattrs/*.attr %config %{_sysconfdir}/java/jpackage-release %config(noreplace) %{_sysconfdir}/java/java.conf %config(noreplace) %{_sysconfdir}/java/font.properties %config(noreplace) %{_sysconfdir}/rpm/macros.jpackage -%config(noreplace) %{_sysconfdir}/rpm/macros.fjava %config(noreplace) ${_mavendepmapdir}/maven2-depmap.xml EOF -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
