diff --git a/bsh.spec b/bsh.spec index 1d134a8..b21d3b2 100644 --- a/bsh.spec +++ b/bsh.spec @@ -133,22 +133,11 @@ $ant test dist %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -install -m 644 dist/%{name}-bsf-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-bsf-%{version}.jar -install -m 644 dist/%{name}-classpath-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-classpath-%{version}.jar -install -m 644 dist/%{name}-commands-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-commands-%{version}.jar -install -m 644 dist/%{name}-core-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar -install -m 644 dist/%{name}-reflect-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-reflect-%{version}.jar -install -m 644 dist/%{name}-util-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-util-%{version}.jar - -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) +for mod in '' bsf classpath commands core reflect util; do + install -p -m 644 dist/%{name}${mod:+-${mod}}-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}${mod:+-${mod}}.jar +done + %add_to_maven_depmap %{name} %{name} %{version} JPP %{name} %add_to_maven_depmap org.beanshell %{name} %{version} JPP %{name} %add_to_maven_depmap %{name} %{name}-bsf %{version} JPP %{name}-bsf @@ -267,6 +256,7 @@ fi - Remove Requires on jpackage-utils - Remove Requires on coreutils - Generate custom scripts with %%jpackage_script +- Install versionless JARs only * Thu Jun 06 2013 Michal Srb - 0:1.3.0-25 - Enable tests