Use %add_maven_depmap instead of legacy macros
This commit is contained in:
parent
354ec46f5b
commit
dc1e371b2b
16
bsh.spec
16
bsh.spec
@ -138,10 +138,6 @@ for mod in '' bsf classpath commands core reflect util; do
|
||||
$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
|
||||
|
||||
# poms
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||
install -pm 644 %{SOURCE1} \
|
||||
@ -149,6 +145,9 @@ install -pm 644 %{SOURCE1} \
|
||||
install -pm 644 %{SOURCE2} \
|
||||
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-bsf.pom
|
||||
|
||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a org.beanshell:%{name}
|
||||
%add_maven_depmap JPP-%{name}-bsf.pom %{name}-bsf.jar
|
||||
|
||||
# manual
|
||||
find docs -name ".cvswrappers" -exec rm -f {} \;
|
||||
find docs -name "*.xml" -exec rm -f {} \;
|
||||
@ -210,18 +209,12 @@ cat scripts/bshdoc.bsh >> $RPM_BUILD_ROOT%{_bindir}/%{name}doc
|
||||
%post utils
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%post
|
||||
%update_maven_depmap
|
||||
|
||||
%postun utils
|
||||
if [ $1 -eq 0 ] ; then
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
fi
|
||||
|
||||
%postun
|
||||
%update_maven_depmap
|
||||
|
||||
%posttrans utils
|
||||
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
@ -250,6 +243,9 @@ fi
|
||||
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
|
||||
|
||||
%changelog
|
||||
* Fri Jul 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3.0-26
|
||||
- Use %%add_maven_depmap instead of legacy macros
|
||||
|
||||
* Wed Jul 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3.0-26
|
||||
- Remove arch-specific conditionals
|
||||
- Remove group tags
|
||||
|
Loading…
Reference in New Issue
Block a user