rpms/bsh
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use %add_maven_depmap instead of legacy macros

Browse Source
This commit is contained in:
Mikolaj Izdebski 2013-07-12 10:35:01 +02:00
parent 354ec46f5b
commit dc1e371b2b
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bsh.spec
View File

@ -138,10 +138,6 @@ for mod in '' bsf classpath commands core reflect util; do
$RPM_BUILD_ROOT%{_javadir}/%{name}${mod:+-${mod}}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}${mod:+-${mod}}.jar
done 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 # poms
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 %{SOURCE1} \ install -pm 644 %{SOURCE1} \
@ -149,6 +145,9 @@ install -pm 644 %{SOURCE1} \
install -pm 644 %{SOURCE2} \ install -pm 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-bsf.pom $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 # manual
find docs -name ".cvswrappers" -exec rm -f {} \; find docs -name ".cvswrappers" -exec rm -f {} \;
find docs -name "*.xml" -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 %post utils
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%post
%update_maven_depmap
%postun utils %postun utils
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi fi
%postun
%update_maven_depmap
%posttrans utils %posttrans utils
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@ -250,6 +243,9 @@ fi
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
%changelog %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 * Wed Jul 10 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3.0-26
- Remove arch-specific conditionals - Remove arch-specific conditionals
- Remove group tags - Remove group tags