commit jpackage-utils for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.jpackage-utils.new/jpackage-utils.changes
2013-07-04 17:58:46.0 +0200
@@ -1,0 +2,6 @@
+Tue Jul 2 13:49:21 UTC 2013 - mvysko...@suse.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.n0Wa1W/_new 2013-07-04 17:58:46.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jpackage-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package jpackage-utils for openSUSE:Factory
checked in at 2012-05-21 08:05:19
Comparing /work/SRC/openSUSE:Factory/jpackage-utils (Old)
and /work/SRC/openSUSE:Factory/.jpackage-utils.new (New)
Package is jpackage-utils, Maintainer is
bnc-team-j...@forge.provo.novell.com
Changes:
--- /work/SRC/openSUSE:Factory/jpackage-utils/jpackage-utils.changes
2012-05-14 16:47:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.jpackage-utils.new/jpackage-utils.changes
2012-05-21 08:05:26.0 +0200
@@ -1,0 +2,6 @@
+Thu May 17 08:28:37 UTC 2012 - mvysko...@suse.cz
+
+- update javapackages to 0.3.1
+ * Create maven provides from fragments instead of poms
+
+---
Old:
javapackages-0.3.0.tar.xz
New:
javapackages-0.3.1.tar.xz
Other differences:
--
++ jpackage-utils.spec ++
--- /var/tmp/diff_new_pack.RwHZx2/_old 2012-05-21 08:05:27.0 +0200
+++ /var/tmp/diff_new_pack.RwHZx2/_new 2012-05-21 08:05:27.0 +0200
@@ -19,7 +19,7 @@
%define distver 1.7
%define section free
-%global fj_version 0.3.0
+%global fj_version 0.3.1
Name: jpackage-utils
Version:1.7.5
@@ -179,7 +179,7 @@
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 cannt fulfill deps in SUSE
+#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)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jpackage-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package jpackage-utils for openSUSE:Factory
checked in at 2012-05-14 16:47:38
Comparing /work/SRC/openSUSE:Factory/jpackage-utils (Old)
and /work/SRC/openSUSE:Factory/.jpackage-utils.new (New)
Package is jpackage-utils, Maintainer is
bnc-team-j...@forge.provo.novell.com
Changes:
--- /work/SRC/openSUSE:Factory/jpackage-utils/jpackage-utils.changes
2012-03-01 17:20:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.jpackage-utils.new/jpackage-utils.changes
2012-05-14 16:47:39.0 +0200
@@ -1,0 +2,5 @@
+Mon May 14 13:06:57 UTC 2012 - mvysko...@suse.cz
+
+- disable maven.req and osgi.req from fileattrs
+
+---
Other differences:
--
++ jpackage-utils.spec ++
--- /var/tmp/diff_new_pack.SYB9De/_old 2012-05-14 16:47:42.0 +0200
+++ /var/tmp/diff_new_pack.SYB9De/_new 2012-05-14 16:47:42.0 +0200
@@ -175,8 +175,13 @@
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 cannt 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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jpackage-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package jpackage-utils for openSUSE:Factory
checked in at 2012-03-01 17:20:35
Comparing /work/SRC/openSUSE:Factory/jpackage-utils (Old)
and /work/SRC/openSUSE:Factory/.jpackage-utils.new (New)
Package is jpackage-utils, Maintainer is
bnc-team-j...@forge.provo.novell.com
Changes:
--- /work/SRC/openSUSE:Factory/jpackage-utils/jpackage-utils.changes
2012-01-27 15:17:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.jpackage-utils.new/jpackage-utils.changes
2012-03-01 17:20:36.0 +0100
@@ -1,0 +2,8 @@
+Wed Feb 29 11:00:51 UTC 2012 - mvysko...@suse.cz
+
+- update javapackages to 0.3.0
+ * fixes in maven_depmap.py
+ * new macro create_javadoc_subpackage
+- fix a typo in maven_depmap.py installation
+
+---
Old:
javapackages-0.2.6.tar.xz
New:
javapackages-0.3.0.tar.xz
Other differences:
--
++ jpackage-utils.spec ++
--- /var/tmp/diff_new_pack.D7ExYV/_old 2012-03-01 17:20:38.0 +0100
+++ /var/tmp/diff_new_pack.D7ExYV/_new 2012-03-01 17:20:38.0 +0100
@@ -19,13 +19,14 @@
%define distver 1.7
%define section free
-%global fj_version 0.2.6
+%global fj_version 0.3.0
Name: jpackage-utils
Version:1.7.5
-Release:15
+Release:0
Summary:JPackage Utilities
License:BSD-3-Clause
+Group: Development/Languages/Java
Url:http://www.jpackage.org/
Source0:%{name}-%{version}.tar.bz2
Source1:jpackage-utils-1.7.5-man-pages.tar.bz2
@@ -44,7 +45,6 @@
#PATCH-FIX-SUSE: in set_jvm_dirs call set_javacmd explicitelly and change
#JAVAVER_LIBDIR to JAVA_LIBDIR if it does not exists
Patch1000: jpackage-utils-jnidir-suse.patch
-Group: Development/Languages/Java
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: xz
@@ -53,13 +53,16 @@
Requires: coreutils
Requires: grep
Requires: python
+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
@@ -181,7 +184,7 @@
$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
+install -pm 644 scripts/maven_depmap.py ${RPM_BUILD_ROOT}%{_javadir}-utils/
popd
cat EOF %{name}-%{version}.files
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jpackage-utils for openSUSE:Factory
Hello community,
here is the log from the commit of package jpackage-utils for openSUSE:Factory
checked in at 2012-01-27 15:17:54
Comparing /work/SRC/openSUSE:Factory/jpackage-utils (Old)
and /work/SRC/openSUSE:Factory/.jpackage-utils.new (New)
Package is jpackage-utils, Maintainer is
bnc-team-j...@forge.provo.novell.com
Changes:
--- /work/SRC/openSUSE:Factory/jpackage-utils/jpackage-utils.changes
2011-09-23 02:04:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.jpackage-utils.new/jpackage-utils.changes
2012-01-27 15:17:57.0 +0100
@@ -1,0 +2,21 @@
+Thu Jan 26 10:21:07 UTC 2012 - mvysko...@suse.cz
+
+- add jpackage-utils-jnidir-suse.patch
+ * SUSE don't have versioned java dir by default, so let's change
+JAVAVER_LIBDIR to /usr/share/java is -%version one does not
+exists instead of fail
+
+---
+Fri Jan 20 12:48:07 UTC 2012 - mvysko...@suse.cz
+
+- sync with Fedora
+ * add abs2rel.sh and abs2rel.lua
+ * add maven related tools from Fedora
+ * new macros like _mavenpomdir and _javajnidir
+ * preffer JRE over JDK in set_java_home
+ * fixed dependencies (removed uneeded Perl, added python for
+maven_depmap.py)
+ * do not create directories for java 1.4.2, add 1.8.0 to be ready
+for the future
+
+---
New:
abs2rel.lua
abs2rel.sh
javapackages-0.2.6.tar.xz
jpackage-utils-jnidir-suse.patch
jpackage-utils-jnidir.patch
jpackage-utils-own-mavendirs.patch
jpackage-utils-prefer-jre.patch
jpackage-utils-set-classpath.patch
Other differences:
--
++ jpackage-utils.spec ++
--- /var/tmp/diff_new_pack.HzM14D/_old 2012-01-27 15:17:58.0 +0100
+++ /var/tmp/diff_new_pack.HzM14D/_new 2012-01-27 15:17:58.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package jpackage-utils (Version 1.7.5)
+# spec file for package jpackage-utils
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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,6 +19,8 @@
%define distver 1.7
%define section free
+%global fj_version 0.2.6
+
Name: jpackage-utils
Version:1.7.5
Release:15
@@ -27,13 +29,31 @@
Url:http://www.jpackage.org/
Source0:%{name}-%{version}.tar.bz2
Source1:jpackage-utils-1.7.5-man-pages.tar.bz2
-Source2:README.SUSE
+Source2:abs2rel.sh
+Source3:abs2rel.lua
+# fedora specific macros
+Source8:
https://fedorahosted.org/released/javapackages/javapackages-%{fj_version}.tar.xz
Source1000: jpackage-utils-rpmlintrc
-Patch0: %{name}-1.7.3-macros.patch
+Source1001: README.SUSE
+#PATCH-FIX-SUSE: skip all macros which are in aaa_base package
+Patch0: jpackage-utils-1.7.3-macros.patch
+Patch1: jpackage-utils-own-mavendirs.patch
+Patch2: jpackage-utils-prefer-jre.patch
+Patch3: jpackage-utils-set-classpath.patch
+Patch4: jpackage-utils-jnidir.patch
+#PATCH-FIX-SUSE: in set_jvm_dirs call set_javacmd explicitelly and change
+#JAVAVER_LIBDIR to JAVA_LIBDIR if it does not exists
+Patch1000: jpackage-utils-jnidir-suse.patch
Group: Development/Languages/Java
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-AutoReqProv:on
-Requires: /bin/egrep, /bin/sed, /usr/bin/perl
+
+BuildRequires: xz
+
+Requires: awk
+Requires: coreutils
+Requires: grep
+Requires: python
+Requires: sed
%description
Utilities for the JPackage project http://www.jpackage.org/.
@@ -41,9 +61,19 @@
%prep
-%setup -q -b 1
+%setup -q -b 1 -a 8
+
%patch0 -b .sav
-cp %{SOURCE2} doc
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%patch1000 -p1
+
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
+
+cp %{SOURCE1001} doc
%build
echo JPackage release %{distver} (%{distribution}) for %{buildarch} \
@@ -53,13 +83,15 @@
# Pull macros out of macros.jpackage and emulate them during install for
# smooth bootstrapping experience.
for dir in \
-jvmdatadir jvmsysconfdir \
-jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
+jvmdir jvmjardir jvmprivdir \
jvmlibdir jvmdatadir jvmsysconfdir \
jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
-mavendepmapdir; do
- export _${dir}=$(rpm --eval $(%{__grep} -E ^%_${dir}\b
misc/macros.jpackage | %{__awk} '{ print $2 }'))
+javadir jnidir javajnidir javadocdir mavenpomdir \
+mavendepmapdir mavendepmapfragdir; do
+ export _${dir}=$(rpm
