SPECS: java-commons-cli.spec, jakarta-commons-cli.spec (REMOVED) - renamed ...

glen glen at pld-linux.org
Mon Nov 24 00:24:08 CET 2008


Author: glen                         Date: Sun Nov 23 23:24:08 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renamed to java-commons-cli.spec

---- Files affected:
SPECS:
   java-commons-cli.spec (1.12 -> 1.13) , jakarta-commons-cli.spec (1.12 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-commons-cli.spec
diff -u SPECS/java-commons-cli.spec:1.12 SPECS/java-commons-cli.spec:1.13
--- SPECS/java-commons-cli.spec:1.12	Thu Nov 29 00:52:56 2007
+++ SPECS/java-commons-cli.spec	Mon Nov 24 00:24:03 2008
@@ -1,20 +1,21 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_without	javadoc		# don't build javadoc
 %bcond_without	tests		# don't run tests
 #
 %include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons CLI - API for working with command line
 Summary(pl.UTF-8):	Jakarta Commons CLI - API do pracy z linią poleceń
-Name:		jakarta-commons-cli
+Name:		java-commons-cli
 Version:	1.1
 Release:	2
 License:	Apache v1.1
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz
 # Source0-md5:	ccc1aa194132e2387557bbb7f65391f4
 URL:		http://jakarta.apache.org/commons/cli/
-Patch0:		%{name}-target.patch
+Patch0:		jakarta-commons-cli-target.patch
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-lang
 BuildRequires:	jakarta-commons-logging
@@ -24,7 +25,10 @@
 %{?with_tests:BuildRequires:	junit}
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 Requires:	jre >= 1.4
+Provides:	jakarta-commons-cli
+Obsoletes:	jakarta-commons-cli
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,9 +70,11 @@
 install dist/commons-cli-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -sf commons-cli-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-cli.jar
 
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,10 +87,12 @@
 %doc LICENSE.txt
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif
 
 %define	date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -92,7 +100,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.12  2007/11/28 23:52:56  glen
+Revision 1.13  2008/11/23 23:24:03  glen
+- renamed to java-commons-cli.spec
+
+Revision 1.12  2007-11-28 23:52:56  glen
 - tests need junit
 - compile with target 1.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-cli.spec?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list