diff --git a/files/0001-disable-deb-rpm.patch b/files/0001-disable-deb-rpm.patch new file mode 100644 --- /dev/null +++ b/files/0001-disable-deb-rpm.patch @@ -0,0 +1,22 @@ +diff --git a/build.gradle b/build.gradle +index 81c8e07..71b1883 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -195,13 +195,13 @@ def rpm(def platform, def arch) { + } + + packageTask('linux', [], 'ext/rocksaw/lib/linux/librocksaw.so') { +- deb('linux', 'i386') +- rpm('linux', 'i386') ++ //deb('linux', 'i386') ++ //rpm('linux', 'i386') + } + + packageTask('linux64', [], 'ext/rocksaw/lib/linux64/librocksaw64.so') { +- deb('linux64', 'amd64') +- rpm('linux64', 'x86_64') ++ //deb('linux64', 'amd64') ++ //rpm('linux64', 'x86_64') + } + + packageTask('win32', 'lib/jna-win32.jar', 'ext/rocksaw/lib/rocksaw.dll') { diff --git a/files/ipscan b/files/ipscan --- a/files/ipscan +++ b/files/ipscan @@ -1,3 +1,3 @@ #!/bin/bash -java -jar /usr/share/ipscan/ipscan-linux64-3.4.2.jar \ No newline at end of file +java -jar /usr/share/ipscan/ipscan.jar \ No newline at end of file diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,23 +1,27 @@ name : ipscan -version : 3.4.2 -release : 2 +version : 3.5.5 +release : 3 source : - - https://github.com/angryziber/ipscan/archive/3.4.2.tar.gz : 378fbd66a97948a07654562089aa92ca0a8d56643a4b18c258c32de5af2c9bdf + - https://github.com/angryziber/ipscan/archive/3.5.5.tar.gz : 0b1cb83442277b369503e82c80ee3e345e8de01464aaa0fc69f616fa6493a232 license : GPL-2.0 component : network.util summary : Angry IP Scanner description: | Angry IP Scanner +networking : yes builddeps : - - apache-ant - - git - - rpm + - openjdk-8 rundeps : - openjdk-8 +environment: | + export GRADLE_USER_HOME=$workdir/.gradle +setup : | + # patch build.gradle file so we skip building .deb and .rpm packages, we only need .jar + %patch -p1 < $pkgfiles/0001-disable-deb-rpm.patch build : | - ant linux64 + %make linux64 install : | install -D -m 00755 $pkgfiles/ipscan $installdir/usr/bin/ipscan install -D -m 00644 $pkgfiles/ipscan.desktop $installdir/usr/share/applications/ipscan.desktop - install -D -m 00755 dist/ipscan-linux64-3.4.2.jar $installdir/usr/share/ipscan/ipscan-linux64-3.4.2.jar - install -D -m 00644 resources/images/icon256.png $installdir/usr/share/pixmaps/ipscan.png + install -D -m 00755 $workdir/build/libs/ipscan-%version%-linux64-%version%.jar $installdir/usr/share/ipscan/ipscan.jar + install -D -m 00644 $workdir/build/resources/main/images/icon256.png $installdir/usr/share/pixmaps/ipscan.png diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,15 +2,15 @@ ipscan - Bryan T. Meyers - bmeyers@datadrake.com + Mislav Čakarić + mcakaric@gmail.com GPL-2.0 network.util Angry IP Scanner Angry IP Scanner - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus ipscan @@ -19,19 +19,19 @@ network.util - /usr/bin + /usr/bin/ipscan /usr/share/applications/ipscan.desktop - /usr/share/ipscan + /usr/share/ipscan/ipscan.jar /usr/share/pixmaps/ipscan.png - - 2016-11-11 - 3.4.2 + + 2019-06-13 + 3.5.5 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Mislav Čakarić + mcakaric@gmail.com \ No newline at end of file