summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <idlemoor@slackbuilds.org>2017-08-29 18:47:04 +0100
committerDavid Spencer <idlemoor@slackbuilds.org>2017-09-02 10:19:45 +0100
commitf8beac1f75d377422eb6097b58abd235d8ed782d (patch)
tree6bd14a87660847c0b9be350eb9f4dfc1ffd31fea
parenta27f2ba955f4caa88acafd337e1913d31e566349 (diff)
downloadslackbuilds-f8beac1f75d377422eb6097b58abd235d8ed782d.tar.gz
system/nagvis: Fixed build.
privacy.diff patch no longer applied (not needed) and the docs needed tweaking. Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--system/nagvis/global.diff (renamed from system/nagvis/patches/global.diff)0
-rw-r--r--system/nagvis/nagvis.SlackBuild5
-rw-r--r--system/nagvis/patches/privacy.diff22
3 files changed, 2 insertions, 25 deletions
diff --git a/system/nagvis/patches/global.diff b/system/nagvis/global.diff
index f544dd270e..f544dd270e 100644
--- a/system/nagvis/patches/global.diff
+++ b/system/nagvis/global.diff
diff --git a/system/nagvis/nagvis.SlackBuild b/system/nagvis/nagvis.SlackBuild
index 2be0aa4a88..d905260602 100644
--- a/system/nagvis/nagvis.SlackBuild
+++ b/system/nagvis/nagvis.SlackBuild
@@ -50,8 +50,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Patches thanks to Debian folks!
-patch -p1 <$CWD/patches/global.diff
-patch -p1 <$CWD/patches/privacy.diff
+patch -p1 <$CWD/global.diff
# Remove cruft
find . -type f -name '.gitignore' -exec rm {} \;
@@ -64,7 +63,7 @@ cp -a etc/{conf.d,geomap,maps} $PKG/etc/$PRGNAM
cp -a share $PKG/usr/share/$PRGNAM
cp -a docs/{de_DE,en_US,general} $PKG/usr/doc/$PRGNAM-$VERSION/html
cp -a nagvis-make-admin $PKG/usr/doc/$PRGNAM-$VERSION/scripts
-cp -a ChangeLog LICENCE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
mv $PKG/usr/share/$PRGNAM/share/userfiles $PKG/var/lib/$PRGNAM
# Put demo maps with documentation
diff --git a/system/nagvis/patches/privacy.diff b/system/nagvis/patches/privacy.diff
deleted file mode 100644
index 02f85795f6..0000000000
--- a/system/nagvis/patches/privacy.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- nagvis-1.8rc3/docs/en_US/toc.html.orig 2015-01-03 18:19:57.000000000 +0100
-+++ nagvis-1.8rc3/docs/en_US/toc.html 2015-02-18 01:49:13.318570773 +0100
-@@ -74,7 +74,7 @@
- <p>(<font style="color:#ff0000;">*</font>) New in 1.8</p>
- <div style="text-align:center;margin-top:20px;">
- <p><a href="http://www.nagvis.org" style="margin: 0px;" class="nostyle"><img width="88" height="23" border="0" alt="NagVis Logo" src="../general/img/logo-88x23.png" style="margin: 0px;" /></a></p>
-- <p><a href="http://sourceforge.net" style="margin: 0px;" class="nostyle"><img width="88" height="31" border="0" alt="SourceForge.net Logo" src="http://sflogo.sourceforge.net/sflogo.php?group_id=132019&amp;type=1" style="margin: 0px;" /></a></p>
-+ <p><a href="http://sourceforge.net" style="margin: 0px;" class="nostyle">SourceForge.net</a></p>
- </div>
- </body>
- </html>
---- nagvis-1.8rc3/docs/de_DE/toc.html.orig 2015-01-03 18:19:57.000000000 +0100
-+++ nagvis-1.8rc3/docs/de_DE/toc.html 2015-02-18 01:50:04.417197043 +0100
-@@ -77,7 +77,7 @@
- -->
- <div style="text-align:center;margin-top:20px;">
- <p><a href="http://www.nagvis.org" style="margin: 0px;" class="nostyle"><img width="88" height="23" border="0" alt="NagVis Logo" src="../general/img/logo-88x23.png" style="margin: 0px;" /></a></p>
-- <p><a href="http://sourceforge.net" style="margin: 0px;" class="nostyle"><img width="88" height="31" border="0" alt="SourceForge.net Logo" src="http://sflogo.sourceforge.net/sflogo.php?group_id=132019&amp;type=1" style="margin: 0px;" /></a></p>
-+ <p><a href="http://sourceforge.net" style="margin: 0px;" class="nostyle">SourceForge.net</a></p>
- </div>
- </body>
- </html>