Hello community,
here is the log from the commit of package openproj
checked in at Mon Sep 15 13:37:41 CEST 2008.
--------
--- openproj/openproj.changes 2007-11-15 11:28:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/openproj/openproj.changes 2008-09-10 16:28:06.000000000 +0200
@@ -1,0 +2,23 @@
+Wed Sep 10 15:57:46 CEST 2008 - mvyskocil@suse.cz
+
+- Update to 1.3
+- bzipped source codes
+- remove unecessary unzip from Build Requires
+- The openproj.sh is generated script in %install section
+- Fix build against openjdk6 - openproj-1.3-build.patch
+- Usage of the system jar files, instead of bundled ones. The new Build
+ Requires of openproj are:
+ - ant-contrib, ant-junit, proguard, jakarta-poi, relaxngDatatype
+ - antlr, asm2, bsf, jakarta-commons-cli, xerces-j2, bsh, ecj
+ - xalan-j2, jakarta-commons-beanutils, jakarta-commons-collections
+ - jakarta-commons-digester, jakarta-commons-lang, jakarta-commons-logging
+ - jakarta-commons-pool, jcommon, jlfgr, nachocalendar
+- source=1.5 -target=1.5
+- Removal of the openproj-patch.sh and openproj-ibm-jdk.patch. Add a three
+ build ways in a prep and build sections:
+ - for sun/openjdk6 is necessary to use a system wide proguard, because
+ the bundled one is not compactible with this compiler
+ - for ibm javac 5 is necessary to replace a rt.jar to core.jar
+ - for ibm javac 6 is necessary te leave and use the bundled proguard
+
+-------------------------------------------------------------------
Old:
----
minmem
openproj-0.9.6.sh
openproj-0.9.6-src.tar.gz
openproj-ibm-jdk.patch
openproj-patch.sh
New:
----
openproj-1.3-ibm-javac.patch
openproj-1.3-openjdk6-javac.patch
openproj-1.3-src.tar.bz2
openproj-1.3-use-system-jars.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openproj.spec ++++++
--- /var/tmp/diff_new_pack.E28099/_old 2008-09-15 13:37:33.000000000 +0200
+++ /var/tmp/diff_new_pack.E28099/_new 2008-09-15 13:37:33.000000000 +0200
@@ -1,33 +1,63 @@
#
-# spec file for package openproj (Version 0.9.6)
+# spec file for package openproj (Version 1.3)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 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
+# 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/
#
# norootforbuild
+
Name: openproj
Summary: Java based project manager
License: Other uncritical OpenSource License
-Version: 0.9.6
-Release: 9
+Version: 1.3
+Release: 1
Url: http://openproj.org/
Group: Productivity/Office/Management
-Source0: %{name}-%{version}-src.tar.gz
-Source1: %{name}-%{version}.sh
+Source0: %{name}-%{version}-src.tar.bz2
Source2: %{name}.desktop
-Source3: %{name}-patch.sh
-Patch0: %{name}-ibm-jdk.patch
+Patch0: openproj-1.3-ibm-javac.patch
+Patch1: openproj-1.3-openjdk6-javac.patch
+Patch2: openproj-1.3-use-system-jars.patch
Requires: jre >= 1.5.0
BuildRequires: java-devel
BuildRequires: ant
-BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: jpackage-utils
+PreReq: jpackage-utils
+BuildRequires: ant-contrib
+BuildRequires: ant-junit
+BuildRequires: proguard
+BuildRequires: jakarta-poi
+BuildRequires: relaxngDatatype
+BuildRequires: antlr
+BuildRequires: asm2
+BuildRequires: bsf
+BuildRequires: jakarta-commons-cli
+BuildRequires: xerces-j2
+BuildRequires: bsh
+BuildRequires: ecj
+BuildRequires: xalan-j2
+BuildRequires: jakarta-commons-beanutils
+BuildRequires: jakarta-commons-collections
+BuildRequires: jakarta-commons-digester
+BuildRequires: jakarta-commons-lang
+BuildRequires: jakarta-commons-logging
+BuildRequires: jakarta-commons-pool
+BuildRequires: jcommon
+BuildRequires: jlfgr
+BuildRequires: nachocalendar
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,14 +75,39 @@
%prep
%setup -q -n %{name}-%{version}-src
-# this patch is a workaround, which looks on the available JDK/JRE and
-# apply the %{PATCH0} only for IBM's JDK/JRE
-# the %ifarch and %ifnarch macros not work in noarch packages
-sh %{SOURCE3} $RPM_SOURCE_DIR
+if [[ $(readlink -f /etc/alternatives/java_sdk | grep 'ibm') ]]; then
+%patch0 -b .ibm-javac
+else
+%patch1 -b .openjdk-javac
+fi
+%patch2 -b .use-system-jars
+# switch from the rt.jar to the core.jar (on IBM Java 1.5.0)
+if [[ -f ${JAVA_HOME}/jre/lib/core.jar ]]; then
+ sed -i 's/\