SPECS: template-java.spec - jdk bconds - use %%srcname for Name without jav...

[pawelz]

Author: pawelz                       Date: Fri Apr  3 14:57:42 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- jdk bconds
- use %%srcname for Name without java- prefix

---- Files affected:
SPECS:
   template-java.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/template-java.spec
diff -u SPECS/template-java.spec:1.32 SPECS/template-java.spec:1.33
--- SPECS/template-java.spec:1.32	Mon Feb  2 13:21:08 2009
+++ SPECS/template-java.spec	Fri Apr  3 16:57:37 2009
@@ -3,8 +3,18 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 %bcond_without	tests		# don't build and run tests
+
+%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
+
+# Name without java- prefix. If it is aplication, not a library,
+# just do s/srcname/name/g
+%define		srcname		-
 Summary:	-
 Name:		-
 Version:	-
@@ -104,8 +114,8 @@
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
-cp -a dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 # for jakarta packages:
 for a in dist/*.jar; do
@@ -116,9 +126,9 @@
 
 # javadoc
 %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
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
 # demo
@@ -129,7 +139,7 @@
 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)
@@ -148,8 +158,8 @@
 %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"`)
@@ -158,6 +168,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2009/04/03 14:57:37  pawelz
+- jdk bconds
+- use %%srcname for Name without java- prefix
+
 Revision 1.32  2009/02/02 12:21:08  glen
 - better group for -demo
 
================================================================

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