Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11053703
D6505.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D6505.diff
View Options
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 @@
<Source>
<Name>ipscan</Name>
<Packager>
- <Name>Bryan T. Meyers</Name>
- <Email>bmeyers@datadrake.com</Email>
+ <Name>Mislav Čakarić</Name>
+ <Email>mcakaric@gmail.com</Email>
</Packager>
<License>GPL-2.0</License>
<PartOf>network.util</PartOf>
<Summary xml:lang="en">Angry IP Scanner</Summary>
<Description xml:lang="en">Angry IP Scanner
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>ipscan</Name>
@@ -19,19 +19,19 @@
</Description>
<PartOf>network.util</PartOf>
<Files>
- <Path fileType="executable">/usr/bin</Path>
+ <Path fileType="executable">/usr/bin/ipscan</Path>
<Path fileType="data">/usr/share/applications/ipscan.desktop</Path>
- <Path fileType="data">/usr/share/ipscan</Path>
+ <Path fileType="data">/usr/share/ipscan/ipscan.jar</Path>
<Path fileType="data">/usr/share/pixmaps/ipscan.png</Path>
</Files>
</Package>
<History>
- <Update release="2">
- <Date>2016-11-11</Date>
- <Version>3.4.2</Version>
+ <Update release="3">
+ <Date>2019-06-13</Date>
+ <Version>3.5.5</Version>
<Comment>Packaging update</Comment>
- <Name>Bryan T. Meyers</Name>
- <Email>bmeyers@datadrake.com</Email>
+ <Name>Mislav Čakarić</Name>
+ <Email>mcakaric@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Aug 11, 11:43 PM (2 h, 51 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5810223
Default Alt Text
D6505.diff (4 KB)
Attached To
Mode
D6505: Update ipscan to 3.5.5
Attached
Detach File
Event Timeline
Log In to Comment