Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm
index f144f019c0c9ed6706f3ad9000a20e71537e30e6..08d7f5334871cce7ebba2561a401bfbfb12ba4cb 100644 (file)
--- a/ghostscript/ghostscript.nm
+++ b/ghostscript/ghostscript.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = ghostscript
-version    = 9.04
-release    = 3
+version    = 9.05
+release    = 1
 
 groups     = Applications/Printing
 url        = http://ghostscript.com
@@ -13,33 +13,56 @@ license    = GPL
 summary    = An interpreter for the PostScript language and for PDF.
 
 description
-       Ghostscript is a package of software that provides:\
-       \
-       * An interpreter for the PostScript (TM) language, with the ability to \
-         convert PostScript language files to many raster formats, view them \
-         on displays, and print them on printers that don't have PostScript \
-         language capability built in; \
-       * An interpreter for Portable Document Format (PDF) files, with the \
-         same abilities; \
-       * The ability to convert PostScript language files to PDF (with some \
-         limitations) and vice versa; and \
-       * A set of C procedures (the Ghostscript library) that implement the \
-         graphics and filtering (data compression / decompression \
-         / conversion) capabilities that appear as primitive operations in \
-         the PostScript language and in PDF.
+       Ghostscript is a package of software that provides an interpreter
+       for the PostScript (TM) language, with the ability to convert PostScript
+       language files to many raster formats, view them on displays, and print
+       them on printers that don't have PostScript  language capability built in.
+       It also contains an interpreter for Portable Document Format (PDF) files,
+       with the same abilities and has the ability to convert PostScript
+       language files to PDF (with some limitations) and vice versa.
+       A set of C procedures (the Ghostscript library) implements the
+       graphics and filtering (data compression / decompression / conversion)
+       capabilities that appear as primitive operations in the PostScript
+       language and in PDF.
 end
 
-source_dl  =
+source_dl  = http://downloads.ghostscript.com/public/
 
 build
+       requires
+               cups-devel
+               dbus-devel
+               glib2-devel
+               libjpeg-devel
+               libtiff-devel
+               libtool
+               libxml2-devel
+               unzip
+               zlib-devel
+       end
+
+       prepare_cmds
+               rm -rvf libpng zlib jpeg jasper expat
+       end
+
+       CFLAGS += -fno-strict-aliasing
+
        configure_options += \
-               --without-omni
+               --with-ijs \
+               --enable-dynamic \
+               --with-drivers=ALL \
+               --disable-compile-inits \
+               --with-system-libtiff \
+               --with-install-cups
 
        PARALLELISMFLAGS = # Disable this
 end
 
 packages
        package %{name}
+
+       package %{name}-devel
+               template DEVEL
        end
 
        package %{name}-debuginfo

diff --git a/pdns/pdns.nm b/pdns/pdns.nm
index 0d0737c0a31dd09e2538651ec41fe31743a5080d..a56570c65135819407c0f9e7147bc2f0825760ef 100644 (file)
--- a/pdns/pdns.nm
+++ b/pdns/pdns.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = pdns
-version    = 3.0
+version    = 3.0.1
 release    = 1
 
 groups     = Networking/DNS
@@ -19,7 +19,7 @@ description
        Furthermore, PowerDNS interfaces with almost any database.
 end
 
-source_dl  =
+source_dl  = http://downloads.powerdns.com/releases/
 
 build
        requires
@@ -38,7 +38,7 @@ build
 
        configure_options += \
                --sysconfdir=/etc/pdns \
-               --libdir=/usr/lib/powerdns \
+               --libdir=%{libdir}/powerdns \
                --with-modules="" \
                --with-dynmodules="pipe geo ldap gsqlite3" \
                --with-lua \
@@ -49,9 +49,9 @@ build
                chrpath --delete %{BUILDROOT}/usr/bin/zone2ldap
                chrpath --delete %{BUILDROOT}/usr/bin/zone2sql
                chrpath --delete %{BUILDROOT}/usr/sbin/pdns_server
-               chrpath --delete %{BUILDROOT}/usr/lib/powerdns/*.so
+               chrpath --delete %{BUILDROOT}%{libdir}/powerdns/*.so
                chrpath --delete %{BUILDROOT}/usr/bin/dnsreplay
-               chrpath --delete %{BUILDROOT}//usr/bin/pdnssec
+               chrpath --delete %{BUILDROOT}/usr/bin/pdnssec
        end
 end
 

diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm
index c91b3165917131f5664954e17755df425f9f2500..af812f10b029d17850cbf1cf47df84b3b680557f 100644 (file)
--- a/psmisc/psmisc.nm
+++ b/psmisc/psmisc.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = psmisc
-version    = 22.10
-release    = 2
+version    = 22.15
+release    = 1
 
 groups     = Applications/System
 url        = http://sourceforge.net/projects/psmisc
@@ -22,7 +22,7 @@ description
        filesystems.
 end
 
-source_dl  =
+source_dl  = http://downloads.sourceforge.net/project/psmisc/psmisc/
 
 build
        requires