pool/avalon-logkit
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 238885 from Java:packages

Browse Source 
FWD Java:packages fixes

OBS-URL: https://build.opensuse.org/request/show/238885
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avalon-logkit?expand=0&rev=8
This commit is contained in:
Stephan Kulow 2014-06-30 20:49:41 +00:00 committed by Git OBS Bridge
commit 283839675a
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
avalon-logkit.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 27 13:01:59 UTC 2014 - tchvatal@suse.com
- Cleanup with spec-cleaner
- Build on SLE11
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 9 11:05:31 UTC 2013 - tchvatal@suse.com Mon Sep 9 11:05:31 UTC 2013 - tchvatal@suse.com

36
avalon-logkit.spec
View File

@ -1,9 +1,8 @@
# #
# spec file for package avalon-logkit # spec file for package avalon-logkit
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2005, JPackage Project # Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +20,6 @@
# #
%define short_name logkit %define short_name logkit
%define camelcase_short_name LogKit %define camelcase_short_name LogKit
Name: avalon-logkit Name: avalon-logkit
Version: 2.1 Version: 2.1
Release: 0 Release: 0
@ -37,12 +35,6 @@ Patch0: fix-java6-compile.patch
Patch1: avalon-logkit-pom-deps.patch Patch1: avalon-logkit-pom-deps.patch
Patch2: avalon-logkit-encoding.patch Patch2: avalon-logkit-encoding.patch
Patch3: fix-java7-compile.patch Patch3: fix-java7-compile.patch
Requires: avalon-framework >= 4.1.4
#Requires: jdbc-stdext
Requires: jms
Requires: servlet30
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: avalon-framework >= 4.1.4 BuildRequires: avalon-framework >= 4.1.4
@ -53,9 +45,12 @@ BuildRequires: jms
BuildRequires: log4j BuildRequires: log4j
BuildRequires: servlet30 BuildRequires: servlet30
BuildRequires: unzip BuildRequires: unzip
Requires: avalon-framework >= 4.1.4
BuildArch: noarch #Requires: jdbc-stdext
Requires: jms
Requires: servlet30
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description %description
LogKit is a logging toolkit designed for secure performance orientated LogKit is a logging toolkit designed for secure performance orientated
@ -71,7 +66,7 @@ Requires: javapackages-tools
API documentation for %{name}. API documentation for %{name}.
%prep %prep
%setup -q %setup -q
%patch0 %patch0
cp %{SOURCE1} pom.xml cp %{SOURCE1} pom.xml
%patch1 %patch1
@ -92,24 +87,25 @@ export CLASSPATH=%(build-classpath \
junit \ junit \
):$PWD/build/classes ):$PWD/build/classes
ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \ ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-lib /usr/share/java -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \
-lib %{_datadir}/java
# Convert to OSGi bundle # Convert to OSGi bundle
#java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar #java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar
%install %install
# jars # jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
#pom #pom
install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir} install -d -m 755 %{buildroot}/%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}" %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}"
# javadoc # javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)