Author: pawelz Date: Sat Apr 3 17:31:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- renamed from avalon-logkit
- unified
- don't build jms part, as we have no jms implementation packaged
---- Files affected:
packages/java-avalon-logkit:
java-avalon-logkit.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/java-avalon-logkit/java-avalon-logkit.spec
diff -u packages/java-avalon-logkit/java-avalon-logkit.spec:1.7
packages/java-avalon-logkit/java-avalon-logkit.spec:1.8
--- packages/java-avalon-logkit/java-avalon-logkit.spec:1.7 Thu Oct 23
19:55:38 2008
+++ packages/java-avalon-logkit/java-avalon-logkit.spec Sat Apr 3 19:31:45 2010
@@ -1,14 +1,24 @@
# $Revision$, $Date$
+%bcond_with jms # build output jms classes
+
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
+
%include /usr/lib/rpm/macros.java
+
+%define srcname avalon-logkit
+
Summary: Java logging toolkit
Summary(pl.UTF-8): Biblioteka do logowania w Javie
-Name: avalon-logkit
+Name: java-avalon-logkit
Version: 1.2
Release: 1
-Epoch: 0
-License: Apache
-Group: Development/Languages/Java
+License: Apache v1.1
+Group: Libraries/Java
Source0:
http://www.apache.org/dist/avalon/logkit/LogKit-%{version}-src.tar.gz
# Source0-md5: 17ede0a7d297ad610b47c476757c2b96
Patch0: %{name}-build.patch
@@ -16,23 +26,25 @@
Patch2: %{name}-java16.patch
URL: http://avalon.apache.org/logkit/
BuildRequires: ant
-#BuildRequires: avalon-framework >= 4.1.4
-BuildRequires: javamail
+BuildRequires: glibc-localedb-all
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+BuildRequires: java-junit
+BuildRequires: java-log4j
+BuildRequires: java-mail
+BuildRequires: java-servletapi
+%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: jdbc-stdext
-BuildRequires: jms
+BuildRequires: jdk
+%{?with_jms:BuildRequires: jms}
+BuildRequires: jpackage-utils
BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: junit
-BuildRequires: logging-log4j
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: servlet
-BuildRequires: jdk
-%if %(locale -a | grep -q '^en_US$'; echo $?)
-BuildRequires: glibc-localedb-all
-%endif
-#Requires: avalon-framework >= 4.1.4
+Requires: java-servletapi
Requires: jdbc-stdext
-Requires: jms
-Requires: servlet
+%{?with_jms:Requires: jms}
+Obsoletes: avalon-logkit
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,6 +64,7 @@
Summary(pl.UTF-8): Dokumentacja Javadoc do pakietu Avalon LogKit
Group: Documentation
Requires: jpackage-utils
+Obsoletes: avalon-logkit-javadoc
%description javadoc
Javadoc for Avalon LogKit.
@@ -61,45 +74,47 @@
%prep
%setup -q -n LogKit-%{version}
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
-required_jars="log4j mailapi jms servlet jdbc-stdext avalon-framework junit"
+required_jars="log4j mail %{?with_jms:jms} servlet-api jdbc-stdext junit"
PWD=$(pwd)
-export CLASSPATH=$(build-classpath $required_jars):$PWD/build/classes
+CLASSPATH=$(build-classpath $required_jars) #:$PWD/build/classes
export LC_ALL=en_US # source code not US-ASCII
+
%ant clean jar javadocs
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a build/lib/logkit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -a build/lib/logkit.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
# javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
symlink
%clean
rm -rf $RPM_BUILD_ROOT
%post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%files
%defattr(644,root,root,755)
%doc KEYS LICENSE
-%{_javadir}/*.jar
+%{_javadir}/%{srcname}.jar
+%{_javadir}/%{srcname}-%{version}.jar
%files javadoc
%defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -107,6 +122,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2010/04/03 17:31:45 pawelz
+- renamed from avalon-logkit
+- unified
+- don't build jms part, as we have no jms implementation packaged
+
Revision 1.7 2008/10/23 17:55:38 pawelz
- added patch that allows to build with java 1.6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-avalon-logkit/java-avalon-logkit.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
