Merge remote-tracking branch 'stevee/fontforge'

diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm
index 53d74bcf4e41b29937b1577949298a9d165eeb8a..acf65d0c3c8f3bde24bc6f7673fb3a953bd494c4 100644 (file)
--- a/c_icap/c_icap.nm
+++ b/c_icap/c_icap.nm
@@ -5,7 +5,7 @@
 
 name       = c_icap
 version    = 0.1.7
-release    = 2
+release    = 3
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -33,7 +33,7 @@ build
        configure_options += \
                --enable-large-files \
                --enable-ipv6 \
-               --sysconfdir=/etc \
+               --sysconfdir=/etc/c-icap \
                --localstatedir=/var
 
        prepare_cmds
@@ -50,6 +50,13 @@ end
 packages
        package %{name}
                requires = %{name}_modules
+
+               configfiles
+                       /etc/c-icap/c-icap.conf
+                       /etc/c-icap/c-icap.conf.default
+                       /etc/c-icap/c-icap.magic
+                       /etc/c-icap/c-icap.magic.default
+               end
        end
 
        package %{name}-debuginfo

diff --git a/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm
index 5f34d46a64c10256e10f738d68ad6e2805a8bbec..d6e2911c8c0c60f9999a58f955cbf5f2cb3edaa0 100644 (file)
--- a/c_icap_modules/c_icap_modules.nm
+++ b/c_icap_modules/c_icap_modules.nm
@@ -5,7 +5,7 @@
 
 name       = c_icap_modules
 version    = 0.1.6
-release    = 1
+release    = 2
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -25,14 +25,14 @@ build
        requires
                autoconf
                automake
-               c_icap
+               c_icap >= 0.1.7-3
                clamav-devel
                db4-devel
                libtool-devel
        end
 
        configure_options += \
-               --sysconfdir=/etc \
+               --sysconfdir=/etc/c-icap \
                --localstatedir=/var
 
        prepare_cmds
@@ -40,13 +40,19 @@ build
        end
 
        install
-               mkdir -pv %{BUILDROOT}/etc
+               mkdir -pv %{BUILDROOT}/etc/c-icap
                make install DESTDIR=%{BUILDROOT}
        end
 end
 
 packages
        package %{name}
+               configfiles
+                       /etc/c-icap/srv_clamav.conf
+                       /etc/c-icap/srv_clamav.conf.default
+                       /etc/c-icap/srv_url_check.conf
+                       /etc/c-icap/srv_url_check.conf.default
+               end
        end
 
        package %{name}-debuginfo

diff --git a/cairo/cairo.nm b/cairo/cairo.nm
index 5cafa622c5694a48d9308dce68023e30ef536338..56bc324be048109e43c3b2b3cf8b8b4b5f41c9f4 100644 (file)
--- a/cairo/cairo.nm
+++ b/cairo/cairo.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = cairo
-version    = 1.10.2
-release    = 3
+version    = 1.12.2
+release    = 1
 
 groups     = System/Graphics
 url        = http://cairographics.org
@@ -18,17 +18,26 @@ description
 end
 
 source_dl  = http://cairographics.org/releases/
+sources    = %{thisapp}.tar.xz
 
 build
        requires
                binutils>=2.21.51.0.8-2
                fontconfig-devel
                freetype-devel
+               libX11-devel
+               libxml2-devel
                libpng-devel
-               pixman-devel
+               pixman-devel>=0.22
                pkg-config
                zlib-devel
        end
+
+       configure_options += \
+               --enable-freetype \
+               --enable-xlib \
+               --enable-xml \
+               --disable-static
 end
 
 packages

diff --git a/pixman/pixman.nm b/pixman/pixman.nm
index fa240805a50ae6eb4ffaeaf6f42f6e7a6e0ad005..573d3438d0d06dedb2871d70509f83d42faed94e 100644 (file)
--- a/pixman/pixman.nm
+++ b/pixman/pixman.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = pixman
-version    = 0.18.4
-release    = 2
+version    = 0.25.6
+release    = 1
 
 groups     = System/Libraries
-url        = http://xorg.freedesktop.org/archive/individual/lib/
+url        = http://www.X.org/
 license    = MIT
 summary    = Pixel manipulation library.
 
@@ -16,18 +16,21 @@ description
        Pixman is a pixel manipulation library for X and cairo.
 end
 
-source_dl  =
+source_dl  = http://xorg.freedesktop.org/archive/individual/lib/
 
 build
        requires
+               libpng-devel
                perl
                pkg-config
        end
+
+       configure_options += \
+               --disable-arm-iwmmxt
 end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL