rpms/tigase-xmltools/F-13 tigase-xmltools.spec,1.1,1.2

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/tigase-xmltools/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2359

Modified Files:
	tigase-xmltools.spec 
Log Message:
Create also unversioned symlink for the jar


Index: tigase-xmltools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tigase-xmltools/F-13/tigase-xmltools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tigase-xmltools.spec	11 May 2010 09:36:46 -0000	1.1
+++ tigase-xmltools.spec	14 May 2010 13:20:40 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tigase-xmltools
 Version:        3.3.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tigase XML Tools
 
 Group:          Development/Libraries
@@ -15,10 +15,13 @@ Source0:        %{name}-%{version}.tar.b
 BuildArch:      noarch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  jpackage-utils
-BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  ant ant-contrib ant-apache-regexp
+%if 0%{?rhel:1}
+BuildRequires:  ant-nodeps
+%endif
 Requires:       jpackage-utils
-Requires:       java >= 1.6.0
+Requires:       java >= 1:1.6.0
 
 %description
 An XML parser dedicated for XMPP stream handling. It is a lightweight
@@ -49,9 +52,9 @@ ant jar docs
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p jars/tigase-xmltools.jar   \
+cp -p jars/%{name}.jar   \
     $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
+ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp docs-tigase-xmltools/api/  \
@@ -62,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*
+%{_javadir}/%{name}*
 %doc COPYING
 
 %files javadoc