public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Mikolaj Izdebski <mizdebsk@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/bsh] epel10: Use %add_maven_depmap instead of legacy macros
Date: Wed, 15 Jul 2026 09:36:23 GMT [thread overview]
Message-ID: <178410818345.1.2642202609352908660.rpms-bsh-dc1e371b2bce@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/bsh
Branch : epel10
Commit : dc1e371b2bcebd68e4bb6bf8b1be279960b8c3cf
Author : Mikolaj Izdebski <mizdebsk@redhat.com>
Date : 2013-07-12T10:58:07+02:00
Stats : +6/-10 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/bsh/c/dc1e371b2bcebd68e4bb6bf8b1be279960b8c3cf?branch=epel10
Log:
Use %add_maven_depmap instead of legacy macros
---
diff --git a/bsh.spec b/bsh.spec
index 6daa492..a6bfaf7 100644
--- a/bsh.spec
+++ b/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
reply other threads:[~2026-07-15 9:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178410818345.1.2642202609352908660.rpms-bsh-dc1e371b2bce@fedoraproject.org \
--to=mizdebsk@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox