SPECS: java-gnu-getopt.spec - changed name from gnu.getopt - please, don't ...

[pawelz]

Author: pawelz                       Date: Fri Apr  3 12:47:38 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- changed name from gnu.getopt
- please, don't add P: gnu.getopt and don't link jar to old name.
  I'll fix all specs on HEAD that depend on this spec
- G: Libraries/Java
- jdk bconds

---- Files affected:
SPECS:
   java-gnu-getopt.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/java-gnu-getopt.spec
diff -u SPECS/java-gnu-getopt.spec:1.11 SPECS/java-gnu-getopt.spec:1.12
--- SPECS/java-gnu-getopt.spec:1.11	Mon Dec 31 16:59:36 2007
+++ SPECS/java-gnu-getopt.spec	Fri Apr  3 14:47:33 2009
@@ -1,20 +1,32 @@
 # $Revision$, $Date$
+%bcond_without javadoc		# don't build apidocs
+
+%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	gnu-getopt
 Summary:	Java getopt implementation
 Summary(pl.UTF-8):	Implementacja getopt w Javie
-Name:		gnu.getopt
+Name:		java-gnu-getopt
 Version:	1.0.13
-Release:	3
+Release:	4
 License:	LGPL
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-%{version}.tar.gz
 # Source0-md5:	46336d9bc055900f0320e5c378d7bfb2
 URL:		http://www.urbanophile.com/arenn/hacking/download.html
 BuildRequires:	ant >= 1.5
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
+Obsoletes:	gnu.getopt
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,6 +52,7 @@
 Summary(pl.UTF-8):	Dokumentacja online do %{name}
 Group:		Documentation
 Requires:	jpackage-utils
+Obsoletes:	gnu.getopt-javadoc
 
 %description javadoc
 Documentation for %{name}.
@@ -55,33 +68,37 @@
 mv gnu/getopt/buildx.xml build.xml
 
 %build
-%ant jar javadoc
+%ant jar %{?with_javadoc:javadoc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -a build/lib/gnu.getopt.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a build/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
 
 %post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
 %doc gnu/getopt/README
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -89,6 +106,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/04/03 12:47:33  pawelz
+- changed name from gnu.getopt
+- please, don't add P: gnu.getopt and don't link jar to old name.
+  I'll fix all specs on HEAD that depend on this spec
+- G: Libraries/Java
+- jdk bconds
+
 Revision 1.11  2007/12/31 15:59:36  glen
 - rel 3
 
================================================================

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