SPECS: java-concurrent.spec, concurrent.spec (REMOVED) - rename to java-con...

[glen]

Author: glen                         Date: Sun Nov 23 23:59:29 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename to java-concurrent.spec

---- Files affected:
SPECS:
   java-concurrent.spec (1.4 -> 1.5) , concurrent.spec (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-concurrent.spec
diff -u SPECS/java-concurrent.spec:1.4 SPECS/java-concurrent.spec:1.5
--- SPECS/java-concurrent.spec:1.4	Mon Jan  7 20:48:36 2008
+++ SPECS/java-concurrent.spec	Mon Nov 24 00:59:24 2008
@@ -1,22 +1,28 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Utility classes for concurrent Java programming
 Summary(pl.UTF-8):	Klasy narzędziowe do programowania współbieżnego w Javie
-Name:		concurrent
+Name:		java-concurrent
 Version:	1.3.2
 Release:	1
 Epoch:		0
-License:	Public Domain
-Group:		Development/Languages/Java
-Source0:	http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/%{name}.tar.gz
+Source0:	http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz
 # Source0-md5:	6a7898a403c3c400f271c6e9285ce9a2
-Source1:	%{name}-ant.xml
+License:	Public Domain
+Source1:	concurrent-ant.xml
+Group:		Libraries/Java
 URL:		http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/
 BuildRequires:	ant
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
+Provides:	concurrent
+Obsoletes:	concurrent
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,13 +44,13 @@
 "Concurrent Programming in Java" (Programowanie współbieżne w Javie).
 
 %package javadoc
-Summary:	Javadoc for %{name}
+Summary:	Javadoc for concurrent library
 Summary(pl.UTF-8):	Dokumentacja Javadoc dla pakietu %{name}
 Group:		Documentation
 Requires:	jpackage-utils
 
 %description javadoc
-Javadoc for %{name}.
+Javadoc for concurrent library
 
 %description javadoc -l pl.UTF-8
 Dokumentacja Javadoc dla pakietu %{name}.
@@ -59,17 +65,20 @@
 %ant \
 	-Dversion=%{version} \
 	-Dj2se.apiurl=%{_javadocdir}/java \
-	jar javadoc
+	jar %{?with_javadoc:javadoc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-install %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install concurrent-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+ln -s concurrent-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/concurrent.jar
 
+# javadoc
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a 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
@@ -81,10 +90,12 @@
 %defattr(644,root,root,755)
 %{_javadir}/concurrent*.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,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2008/11/23 23:59:24  glen
+- rename to java-concurrent.spec
+
 Revision 1.4  2008/01/07 19:48:36  qboosh
 - pl
 - unified License spelling
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-concurrent.spec?r1=1.4&r2=1.5&f=u