Hello community,
here is the log from the commit of package jakarta-commons-transaction for
openSUSE:Factory checked in at 2017-05-27 13:15:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jakarta-commons-transaction (Old)
and /work/SRC/openSUSE:Factory/.jakarta-commons-transaction.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-transaction"
Sat May 27 13:15:43 2017 rev:14 rq:496808 version:1.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-transaction/jakarta-commons-transaction.changes
2013-09-12 17:06:46.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-transaction.new/jakarta-commons-transaction.changes
2017-05-27 13:15:44.341780176 +0200
@@ -1,0 +2,5 @@
+Fri May 19 16:09:55 UTC 2017 - tchva...@suse.com
+
+- Remove the maven conditional
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-transaction.spec ++++++
--- /var/tmp/diff_new_pack.KxtseN/_old 2017-05-27 13:15:44.909699885 +0200
+++ /var/tmp/diff_new_pack.KxtseN/_new 2017-05-27 13:15:44.913699320 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-transaction
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,16 +16,7 @@
#
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-%define _without_maven 1
-%bcond_with maven
-%define gcj_support
%{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define section free
%define base_name commons-transaction
-
Name: jakarta-commons-transaction
Version: 1.1
Release: 0
@@ -39,33 +30,22 @@
Source3: pom-maven2jpp-mapdeps.xsl
Source4: commons-transaction-1.1-jpp-depmap.xml
Patch0: commons-transaction-1.1-project_xml.patch
-Requires: jakarta-commons-codec
-Requires: log4j
-#Requires: jta
-Requires: geronimo-jta-1_1-api
-Requires: xerces-j2
-Requires: xml-commons-apis
BuildRequires: ant >= 1.6
-BuildRequires: javapackages-tools
-%if %with maven
-BuildRequires: maven >= 1.0.2
-BuildRequires: maven-plugin-license
-BuildRequires: maven-plugin-test
-BuildRequires: maven-plugin-xdoc
-BuildRequires: maven-plugins-base
-BuildRequires: saxon
-BuildRequires: saxon-scripts
-%endif
-#BuildRequires: jta
BuildRequires: geronimo-jta-1_1-api
BuildRequires: jakarta-commons-beanutils
BuildRequires: jakarta-commons-codec
+BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
-BuildArch: noarch
+Requires: geronimo-jta-1_1-api
+Requires: jakarta-commons-codec
+Requires: log4j
+Requires: xerces-j2
+Requires: xml-commons-apis
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
Commons Transaction aims at providing lightweight, standardized, well
@@ -76,95 +56,29 @@
for them becomes obvious. However, the complete component shall remain
compatible to JDK1.2 and should have minimal dependencies.
-
-
-%package javadoc
-Summary: Commons Transaction
-Group: Development/Libraries/Java
-
-%description javadoc
-Commons Transaction aims at providing lightweight, standardized, well
-tested and efficient implementations of utility classes commonly used
-in transactional Java programming. Initially there are implementations
-for multi level locks, transactional collections and transactional file
-access. There may be additional implementations when the common need
-for them becomes obvious. However, the complete component shall remain
-compatible to JDK1.2 and should have minimal dependencies.
-
-
-
%prep
%setup -q -c -n %{base_name}
find . -name "*.jar" | xargs rm
-%if %with maven
-export DEPCAT=$(pwd)/commons-transaction-1.1-depcat.new.xml
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT
- popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-%{_bindir}/saxon $DEPCAT %{SOURCE2} > commons-transaction-1.1-depmap.new.xml
-%endif
%patch0 -b .sav
%build
-%if %with maven
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- %{_bindir}/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-maven -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.javadoc.source=1.4 \
- -Dmaven.home.local=$(pwd)/.maven \
- jar javadoc
-%else
export CLASSPATH=$(build-classpath commons-codec jta log4j):`pwd`/build/classes
export OPT_JAR_LIST=:
-ant -Dbuild.sysclasspath=only jar javadocs
-%endif
+ant -Dbuild.sysclasspath=only jar
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-%if %with maven
-install -m 644 target/commons-transaction-1.1.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%else
+install -d -m 755 %{buildroot}%{_javadir}
install -m 644 build/lib/commons-transaction-1.1.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%endif
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do \
+ %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in jakarta-*; do \
ln -sf ${jar} ${jar/jakarta-/}; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
ln -sf ${jar} ${jar/-%{version}/}; done)
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %with maven
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%else
-cp -pr build/doc/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%endif
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# FIXME: (dwalluck): this breaks -bi --short-circuit
-rm -rf target/docs/apidocs
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_javadir}/*
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
-
%changelog
