Author: pawelz Date: Wed Jun 9 18:00:53 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- merged HEAD. Does not build.
---- Files affected:
packages/java-commons-logging:
java-commons-logging.spec (1.21.2.4 -> 1.21.2.5)
---- Diffs:
================================================================
Index: packages/java-commons-logging/java-commons-logging.spec
diff -u packages/java-commons-logging/java-commons-logging.spec:1.21.2.4
packages/java-commons-logging/java-commons-logging.spec:1.21.2.5
--- packages/java-commons-logging/java-commons-logging.spec:1.21.2.4 Sun Mar
29 17:43:43 2009
+++ packages/java-commons-logging/java-commons-logging.spec Wed Jun 9
20:00:48 2010
@@ -1,13 +1,12 @@
# $Revision$, $Date$
-%bcond_with java_sun # build with java-sun
-
-%if "%{pld_release}" == "ti"
-%define with_java_sun 1
-%endif
-
-%define srcname commons-logging
+# TODO
+# - update to 1.1 from DEVEL
+#
+# Conditional build:
+%bcond_without javadoc # don't build javadoc
%include /usr/lib/rpm/macros.java
+%define srcname commons-logging
Summary: Commons Logging - interface for logging systems
Summary(pl.UTF-8): Commons Logging - interfejs do systemów logujących
Name: java-commons-logging
@@ -17,23 +16,21 @@
Group: Development/Languages/Java
Source0:
http://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz
# Source0-md5: e5cfa8cca13152d7545fde6b1783c60a
-Patch0: %{name}-target.patch
URL: http://commons.apache.org/logging/
BuildRequires: ant
BuildRequires: ant-junit
-BuildRequires: avalon-framework
-BuildRequires: avalon-logkit
-BuildRequires: jakarta-servletapi >= 4
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: java(servlet)
+BuildRequires: java-avalon-framework
+BuildRequires: java-avalon-logkit
+BuildRequires: java-junit
+BuildRequires: java-log4j
+BuildRequires: jdk >= 1.4
BuildRequires: jpackage-utils
-BuildRequires: junit
-BuildRequires: logging-log4j
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
+Requires: jpackage-utils
Requires: jre >= 1.4
Obsoletes: jakarta-commons-logging
-Provides: jakarta-commons-logging
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,6 +54,7 @@
Summary(pl.UTF-8): Dokumentacja do Commons Logging
Group: Documentation
Requires: jpackage-utils
+Provides: jakarta-commons-logging-javadoc
Obsoletes: jakarta-commons-logging-doc
Obsoletes: jakarta-commons-logging-javadoc
@@ -68,11 +66,12 @@
%prep
%setup -q -n commons-logging-%{version}-src
-#%patch0 -p1
%build
required_jars="log4j junit avalon-logkit avalon-framework-impl servlet-api"
-export CLASSPATH=$(build-classpath $required_jars)
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
+
%ant dist javadoc
%install
@@ -84,8 +83,12 @@
ln -s %{srcname}-%{version}-api.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-api.jar
ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
+# javadoc
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
symlink
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -98,10 +101,12 @@
%doc dist/*.txt
%{_javadir}/*.jar
+%if %{with javadoc}
%files javadoc
%defattr(644,root,root,755)
%{_javadocdir}/%{srcname}-%{version}
%ghost %{_javadocdir}/%{srcname}
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -109,6 +114,36 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21.2.5 2010/06/09 18:00:48 pawelz
+- merged HEAD. Does not build.
+
+Revision 1.29 2010/04/18 14:17:45 pawelz
+- updated java deps
+
+Revision 1.28 2008/12/25 20:17:08 pawelz
+- added Provides/Obsolets old name for subpackage
+- it is no longer part of Jakarta project
+
+Revision 1.27 2008/12/25 20:14:10 pawelz
+- BR: junit
+
+Revision 1.26 2008/12/25 19:10:52 pawelz
+- build without avalon-*, becoause avalon-* build-requires commons-logging
+
+Revision 1.25 2008/12/25 18:02:09 pawelz
+- BR: avalon-*
+- pass correct jar names to build-classpath
+- it builds now
+
+Revision 1.24 2008/11/23 23:43:43 glen
+- rename to java-commons-logging.spec
+
+Revision 1.23 2007-12-08 14:04:49 glen
+- add todo; EA drop; rel 4
+
+Revision 1.22 2007-12-07 23:41:09 glen
+- new url
+
Revision 1.21.2.4 2009/03/29 15:43:43 pawelz
- jdk bconds
- dropped EA
@@ -174,7 +209,7 @@
- updated to 1.0.4
Revision 1.7 2004/07/15 11:52:05 pluto
-- use %%{_javadir}.
+- use %{_javadir}.
Revision 1.6 2003/07/02 12:00:31 pascalek
- updated to 1.0.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-logging/java-commons-logging.spec?r1=1.21.2.4&r2=1.21.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
