SPECS: java-commons-beanutils.spec, jakarta-commons-beanutils.spec (REMOVED...

[glen]

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

---- Files affected:
SPECS:
   java-commons-beanutils.spec (1.17 -> 1.18) , jakarta-commons-beanutils.spec (1.17 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-commons-beanutils.spec
diff -u SPECS/java-commons-beanutils.spec:1.17 SPECS/java-commons-beanutils.spec:1.18
--- SPECS/java-commons-beanutils.spec:1.17	Wed Jan  2 00:40:29 2008
+++ SPECS/java-commons-beanutils.spec	Sun Nov 23 22:08:53 2008
@@ -1,15 +1,19 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons BeanUtils - Bean Introspection Utilities
 Summary(pl.UTF-8):	Jakarta Commons BeanUtils - narzędzia do badania JavaBeans
-Name:		jakarta-commons-beanutils
+Name:		java-commons-beanutils
 Version:	1.7.0
 Release:	3
 License:	Apache
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz
 # Source0-md5:	3fd5cbdf70363b151de5cd538f726e67
-Patch0:		%{name}-target.patch
+Patch0:		jakarta-commons-beanutils-target.patch
 URL:		http://commons.apache.org/beanutils/
 BuildRequires:	jakarta-commons-collections
 BuildRequires:	jakarta-commons-logging
@@ -18,6 +22,8 @@
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre
+Obsoletes:	jakarta-commons-beanutils
+Provides:	jakarta-commons-beanutils
 Suggests:	jakarta-commons-collections
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,17 +70,18 @@
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
-cp -a dist/commons-beanutils.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-%{version}.jar
-ln -s commons-beanutils-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils.jar
 cp -a dist/commons-beanutils-core.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-core-%{version}.jar
 ln -s commons-beanutils-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-core.jar
+
 cp -a dist/commons-beanutils-bean-collections.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-bean-collections-%{version}.jar
 ln -s commons-beanutils-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-bean-collections.jar
 
 # javadoc
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,10 +94,12 @@
 %doc *.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
@@ -98,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2008/11/23 21:08:53  glen
+- renamed to java-commons-beanutils.spec
+
 Revision 1.17  2008/01/01 23:40:29  glen
 - rel 3
 
================================================================

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