From c429a0b3d3f7ca7fe03059acc47362c729213e98 Mon Sep 17 00:00:00 2001 From: Anton Keks Date: Mon, 15 Jul 2019 22:50:21 +0300 Subject: [PATCH] use the same launcher script for both Debian and Fedora --- .idea/misc.xml | 2 +- ext/rpmbuild/SPECS/ipscan.spec | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index aecb7420..b9387068 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/ext/rpmbuild/SPECS/ipscan.spec b/ext/rpmbuild/SPECS/ipscan.spec index 443a7dc2..f6694b00 100644 --- a/ext/rpmbuild/SPECS/ipscan.spec +++ b/ext/rpmbuild/SPECS/ipscan.spec @@ -27,8 +27,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ipscan $RPM_BUILD_ROOT/%{_datadir}/applicati cp ../../%{name}-%{platform}-%{version}.jar $RPM_BUILD_ROOT/%{_libdir}/ipscan/ cp ../../../../ext/deb-bundle/usr/share/applications/ipscan.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ cp ../../../../resources/images/icon128.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ipscan.png -echo "#/bin/sh" > $RPM_BUILD_ROOT/%{_bindir}/ipscan -echo "java -jar %{_libdir}/ipscan/ipscan*.jar" >> $RPM_BUILD_ROOT/%{_bindir}/ipscan +cp ../../../../ext/deb-bundle/usr/bin/ipscan $RPM_BUILD_ROOT/%{_bindir}/ chmod a+x $RPM_BUILD_ROOT/%{_bindir}/ipscan %clean