[packages/java-commons-logging] - up to 1.1.3
arekm
arekm at pld-linux.org
Tue Feb 11 22:22:26 CET 2014
commit c565bc78ea0a917c13a316cc5e99337f0211f073
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Feb 11 22:22:23 2014 +0100
- up to 1.1.3
build.xml.patch | 11 -----------
java-commons-logging.spec | 23 ++++++++---------------
2 files changed, 8 insertions(+), 26 deletions(-)
---
diff --git a/java-commons-logging.spec b/java-commons-logging.spec
index 39f76cd..c4884e3 100644
--- a/java-commons-logging.spec
+++ b/java-commons-logging.spec
@@ -9,12 +9,12 @@
Summary: Commons Logging - interface for logging systems
Summary(pl.UTF-8): Commons Logging - interfejs do systemów logujących
Name: java-commons-logging
-Version: 1.1.1
+Version: 1.1.3
Release: 1
License: Apache v2.0
Group: Libraries/Java
Source0: http://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz
-# Source0-md5: e5cfa8cca13152d7545fde6b1783c60a
+# Source0-md5: e8e197d628436490886d17cffa108fe3
Patch0: build.xml.patch
URL: http://commons.apache.org/logging/
BuildRequires: ant
@@ -70,37 +70,30 @@ EOF
export LC_ALL=en_US
-%ant
+# like default but without test
+%ant clean compile
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-install target/commons-logging-1.1.1.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}.jar
-install target/commons-logging-adapters-1.1.1.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-adapters-%{version}.jar
-install target/commons-logging-api-1.1.1.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-api-%{version}.jar
-install target/commons-logging-appender.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-appender-%{version}.jar
-install target/commons-logging-wrapper.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-wrapper-%{version}.jar
+install target/commons-logging-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}.jar
+install target/commons-logging-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-adapters-%{version}.jar
+install target/commons-logging-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-api-%{version}.jar
ln -s commons-logging-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging.jar
ln -s commons-logging-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-adapters.jar
ln -s commons-logging-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-api.jar
-ln -s commons-logging-appender-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-appender.jar
-ln -s commons-logging-wrapper-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-wrapper.jar
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc NOTICE.txt PROPOSAL.html RELEASE-NOTES.txt STATUS.html license-header.txt
+%doc NOTICE.txt PROPOSAL.html RELEASE-NOTES.txt license-header.txt
%{_javadir}/commons-logging-%{version}.jar
%{_javadir}/commons-logging.jar
%{_javadir}/commons-logging-adapters-%{version}.jar
%{_javadir}/commons-logging-adapters.jar
%{_javadir}/commons-logging-api-%{version}.jar
%{_javadir}/commons-logging-api.jar
-%{_javadir}/commons-logging-appender-%{version}.jar
-%{_javadir}/commons-logging-appender.jar
-%{_javadir}/commons-logging-wrapper-%{version}.jar
-%{_javadir}/commons-logging-wrapper.jar
diff --git a/build.xml.patch b/build.xml.patch
index 8470e5c..94d87e5 100644
--- a/build.xml.patch
+++ b/build.xml.patch
@@ -1,14 +1,3 @@
---- commons-logging-1.1.1-src/build.xml~ 2010-06-09 20:47:36.000000000 +0200
-+++ commons-logging-1.1.1-src/build.xml 2010-06-09 20:48:11.000000000 +0200
-@@ -94,7 +94,7 @@
- <property name="component.title" value="Logging Wrapper Library"/>
-
- <!-- The current version number of this component -->
-- <property name="component.version" value="1.1.1-SNAPSHOT"/>
-+ <property name="component.version" value="1.1.1"/>
-
- <!-- The base directory for compilation targets -->
- <property name="build.home" value="${basedir}/target"/>
--- commons-logging-1.1.1-src/build.xml~ 2007-11-22 00:27:52.000000000 +0100
+++ commons-logging-1.1.1-src/build.xml 2010-06-09 20:27:15.000000000 +0200
@@ -146,7 +146,8 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-commons-logging.git/commitdiff/c565bc78ea0a917c13a316cc5e99337f0211f073
More information about the pld-cvs-commit
mailing list