SPECS: java-commons-io.spec - use %%srcname macro - correct dir for javadoc

[pawelz]

Author: pawelz                       Date: Tue Feb 10 13:03:55 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %%srcname macro
- correct dir for javadoc

---- Files affected:
SPECS:
   java-commons-io.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/java-commons-io.spec
diff -u SPECS/java-commons-io.spec:1.13 SPECS/java-commons-io.spec:1.14
--- SPECS/java-commons-io.spec:1.13	Tue Feb 10 11:20:23 2009
+++ SPECS/java-commons-io.spec	Tue Feb 10 14:03:50 2009
@@ -5,6 +5,8 @@
 %bcond_with	tests		# run tests (takes long time)
 
 %include	/usr/lib/rpm/macros.java
+
+%define		srcname	commons-io
 Summary:	Commons IO component for Java servlets
 Summary(pl.UTF-8):	Komponent Commons IO dla serwletów Javy
 Name:		java-commons-io
@@ -75,16 +77,16 @@
 
 # javadoc
 %if %{with javadoc}
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a target/apidocs/* $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 target/apidocs/* $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)
@@ -93,8 +95,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"`)
@@ -103,6 +105,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2009/02/10 13:03:50  pawelz
+- use %%srcname macro
+- correct dir for javadoc
+
 Revision 1.13  2009/02/10 10:20:23  pawelz
 - rel 2
 
================================================================

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