This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via a08ffb152cc0f21d4c98ea61d675983483f5e9c9 (commit) via caa5adcc6ccc1ca6101a1644d585bd6ada45a28b (commit) via 9b22dfa91f5a926190ff83ba38b508daf407a5d7 (commit) via aadd49f4fdb3e1ae5dfcb587e9e59955cf29b0cc (commit) via ceff1d93cdfbb521425f06f3c26b887b575f246b (commit) from f9f6a6f5e14e6b160bb511d08cca04e6ee712a32 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit a08ffb152cc0f21d4c98ea61d675983483f5e9c9 Merge: caa5adc 9b22dfa Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 24 21:03:57 2012 +0200

Merge remote-tracking branch 'stevee/xclock'

commit caa5adcc6ccc1ca6101a1644d585bd6ada45a28b Merge: f9f6a6f aadd49f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 24 21:03:52 2012 +0200

Merge remote-tracking branch 'stevee/fontforge-fix'

commit 9b22dfa91f5a926190ff83ba38b508daf407a5d7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu May 24 21:00:39 2012 +0200

xclock: New package.

commit aadd49f4fdb3e1ae5dfcb587e9e59955cf29b0cc Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu May 24 20:55:26 2012 +0200

fontforge: Add more build dependencies.

libXft-devel and pango with enabled support are required to build fontforge on any architecture except x86_64.

commit ceff1d93cdfbb521425f06f3c26b887b575f246b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu May 24 20:52:30 2012 +0200

pango: Enable xft support from libXft.

This is required to build fontforge.

-----------------------------------------------------------------------

Summary of changes: fontforge/fontforge.nm | 5 ++- pango/pango.nm | 3 +- libXmu/libXmu.nm => xclock/xclock.nm | 35 +++++++++++++-------------------- 3 files changed, 19 insertions(+), 24 deletions(-) copy libXmu/libXmu.nm => xclock/xclock.nm (57%)

Difference in files: diff --git a/fontforge/fontforge.nm b/fontforge/fontforge.nm index b281856..75984ed 100644 --- a/fontforge/fontforge.nm +++ b/fontforge/fontforge.nm @@ -5,7 +5,7 @@

name = fontforge version = 20110222 -release = 1 +release = 2

groups = Applications/Publishing url = http://fontforge.sourceforge.net/ @@ -30,9 +30,10 @@ build libjpeg-devel libpng-devel libtiff-devel + libXft-devel libXt-devel libxml2-devel - pango-devel + pango-devel>=1.29.5-2 python-devel xorg-x11-proto-devel end diff --git a/pango/pango.nm b/pango/pango.nm index b544a9a..ba16ffb 100644 --- a/pango/pango.nm +++ b/pango/pango.nm @@ -6,7 +6,7 @@ name = pango major = 1.29 version = %{major}.5 -release = 1 +release = 2

groups = System/Libraries url = http://www.pango.org/ @@ -29,6 +29,7 @@ build gcc-c++ glib2-devel glibc-devel + libXft-devel perl pkg-config end diff --git a/xclock/xclock.nm b/xclock/xclock.nm new file mode 100644 index 0000000..e4a7104 --- /dev/null +++ b/xclock/xclock.nm @@ -0,0 +1,43 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = xclock +version = 1.0.6 +release = 1 + +maintainer = Stefan Schantl stefan.schantl@ipfire.org +groups = X/Tools +url = http://www.x.org +license = MIT +summary = A classic X Window System clock utility. + +description + xclock is the classic X Window System clock utility. It displays + the time in analog or digital form, continuously updated at a + frequency which may be specified by the user. +end + +source_dl = http://ftp.x.org/pub/individual/app/ +sources = %{thisapp}.tar.bz2 + +build + requires + libX11-devel + libXaw-devel + libXft-devel + libXmu-devel + libXrender-devel + libxkbfile-devel + xorg-x11-util-macros + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end

hooks/post-receive -- IPFire 3.x development tree