Merge remote-tracking branch 'stevee/image-magick'

diff --git a/icecream/icecream.nm b/icecream/icecream.nm
index dad6c99a57ce9e5fb132af28eb87f5ad6b953ab5..be1ee15953b82513bb41ade701694891e9f53db7 100644 (file)
--- a/icecream/icecream.nm
+++ b/icecream/icecream.nm
@@ -3,11 +3,9 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-# XXX initscripts for daemons are missing
-
 name       = icecream
 version    = 0.9.7
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Development/Compilers
@@ -77,6 +75,10 @@ build
                rm -rvf %{BUILDROOT}/usr/bin/cc
                rm -rvf %{BUILDROOT}/usr/bin/g++
                rm -rvf %{BUILDROOT}/usr/bin/gcc
+
+               # Create Logfiles.
+               mkdir -pv %{BUILDROOT}/var/log
+               touch %{BUILDROOT}/var/log/icecc{d,-scheduler}.log
        end
 end
 
@@ -86,6 +88,29 @@ packages
                        gcc-c++
                        /usr/bin/ldd
                end
+
+               prerequires += systemd-units
+
+               script postin
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       /bin/systemctl --no-reload disable iceccd.service \
+                               icecc-scheduler.service >/dev/null 2>&1 || :
+                       /bin/systemctl stop iceccd.service \
+                               icecc-scheduler.service >/dev/null 2>&1 || :
+               end
+
+               script postun
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+                       /bin/systemctl try-restart iceccd.service \
+                               icecc-scheduler.service >/dev/null 2>&1 || :
+               end
        end
        
        package %{name}-devel

diff --git a/icecream/systemd/icecc-scheduler.service b/icecream/systemd/icecc-scheduler.service
new file mode 100644 (file)
index 0000000..38a1402
--- /dev/null
+++ b/icecream/systemd/icecc-scheduler.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Icecream job scheduler
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/icecc-scheduler -vvv -d -p 8765 -l /var/log/icecc-scheduler.log
+
+[Install]
+WantedBy=multi-user.target

diff --git a/icecream/systemd/iceccd.service b/icecream/systemd/iceccd.service
new file mode 100644 (file)
index 0000000..aab8d30
--- /dev/null
+++ b/icecream/systemd/iceccd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Icecream daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/iceccd -vvv -d -s localhost -m 2 -l /var/log/iceccd.log
+
+[Install]
+WantedBy=multi-user.target

diff --git a/libpng/libpng.nm b/libpng/libpng.nm
index 3b1ded281b981a8d643ef5939a182d51a782c553..31fdf84080793d93e8720ff40b8121ff35d70f8f 100644 (file)
--- a/libpng/libpng.nm
+++ b/libpng/libpng.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libpng
-version    = 1.5.4
+version    = 1.5.6
 release    = 1
 
 groups     = System/Libraries
@@ -20,7 +20,7 @@ description
        data compression algorithm.
 end
 
-source_dl  =
+source_dl  = http://downloads.sourceforge.net/project/libpng/libpng15/%{version}/
 sources    = %{thisapp}.tar.xz
 
 build
@@ -32,8 +32,7 @@ end
 
 packages
        package %{name}
-       end
-       
+
        package %{name}-devel
                template DEVEL
        

diff --git a/tcl/tcl.nm b/tcl/tcl.nm
index 7b941f2bef0a0ad64a67bd754b0412468d4d1464..528b3dbdbe8dc09286c263dbd31a7b30df944b02 100644 (file)
--- a/tcl/tcl.nm
+++ b/tcl/tcl.nm
@@ -5,7 +5,7 @@
 
 name       = tcl
 version    = 8.5.10
-release    = 1
+release    = 2
 
 groups     = Development/Languages
 url        = http://tcl.sourceforge.net/
@@ -44,7 +44,10 @@ build
        end
 
        test
-               make test
+               # Skip remote tests http, httpold and socket.
+               # Also skip unixInit-1.1. This test fails because "kill -PIPE"
+               # will be executed and we don't support that.
+               make test TESTFLAGS="-skip 'http* socket* unixInit-1.1'"
        end
 
        install_cmds