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 b9605c0741ed04dbd13b063fdca7ea8712643f70 (commit) via 08acf999d3483e550da27a7e74a8d235ace6f000 (commit) via a732dc651912e0d797347ee7277dfa29474e34a3 (commit) via 21d4da18dd3eaaa8fd3d3ffef71ed0a84c5506bc (commit) via f43608d25adde6c0834b4ef0f6db0bf8e616ebb9 (commit) via 3514c30768f32b16f326c53654524351e5ceb760 (commit) via 82f338a15a5ca9a32ad51a0d75d51627c87e8482 (commit) via 6c7eb71507ec361870b6e95e48835c01e1900a35 (commit) via 282acce731b922e9698906da91ec5440ee1cea06 (commit) via a6988ba22971f9bde03c0abd7ac42956198d65cb (commit) via 53a325cb0f4954ecc1d29061756f72f7b36a63eb (commit) via a70c250f73cbb1dbc73f3d1e0a6a7cd53fb0697f (commit) via f6340afbcff3f953a5335623a9cbb37bafd540d7 (commit) via 8a0b74477e372cfc4c9189fa417098c048b974f3 (commit) via f6a10344ab331ac4a4ae4c1660fced8381a3a353 (commit) from dbfde53218e258c5b0e660caa12458249e510631 (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 b9605c0741ed04dbd13b063fdca7ea8712643f70 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 17:35:41 2011 +0200
sysvinit: Install this on all systems by default.
commit 08acf999d3483e550da27a7e74a8d235ace6f000 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 17:35:18 2011 +0200
cpufrequtils: Only main package belongs to Base group.
commit a732dc651912e0d797347ee7277dfa29474e34a3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 17:34:59 2011 +0200
udev: Only main package belongs to Base group.
commit 21d4da18dd3eaaa8fd3d3ffef71ed0a84c5506bc Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 17:33:53 2011 +0200
pcre: Update to 8.20.
Fixes #267.
commit f43608d25adde6c0834b4ef0f6db0bf8e616ebb9 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 17:33:28 2011 +0200
chrony: Only the main package belongs to Base group.
commit 3514c30768f32b16f326c53654524351e5ceb760 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 17:32:53 2011 +0200
dracut: Fix runtime dependencies.
kpartx (from multipath-tools) is needed at runtime and iproute2 was mispelled.
commit 82f338a15a5ca9a32ad51a0d75d51627c87e8482 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 17:32:27 2011 +0200
automake: Rebuild with new perl.
commit 6c7eb71507ec361870b6e95e48835c01e1900a35 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 17:31:54 2011 +0200
autoconf: Rebuild with new perl.
Also fixes weird perl requirements.
commit 282acce731b922e9698906da91ec5440ee1cea06 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 17:43:33 2011 +0200
icecream: Update to 0.9.7.
Fixes the lto plugin problem.
commit a6988ba22971f9bde03c0abd7ac42956198d65cb Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 17:11:19 2011 +0200
xz: Install lzma command in build environment.
It is needed to extract tar.lzma package (which are very rarely used).
The command is also installable by running "pakfire install lzma".
commit 53a325cb0f4954ecc1d29061756f72f7b36a63eb Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 11:58:45 2011 +0200
systemd: Add vala support.
commit a70c250f73cbb1dbc73f3d1e0a6a7cd53fb0697f Merge: f6340af 8a0b744 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 11:58:11 2011 +0200
Merge remote-tracking branch 'stevee/icecc-manpages'
commit f6340afbcff3f953a5335623a9cbb37bafd540d7 Merge: dbfde53 f6a1034 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 21 11:57:05 2011 +0200
Merge remote-tracking branch 'stevee/update-glib2'
commit 8a0b74477e372cfc4c9189fa417098c048b974f3 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Oct 19 20:35:15 2011 +0200
icecream: Add manpages / remove unwanted files.
We use pregenerated manpages from a tarball, because we don't have the needed docbook catalog to generate the manpages. We absolutely don't want to include kdelibs into IPFire to get those catalog files.
commit f6a10344ab331ac4a4ae4c1660fced8381a3a353 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Oct 19 18:26:55 2011 +0200
glib2: Update to 2.30.1.
Fixes #265
-----------------------------------------------------------------------
Summary of changes: autoconf/autoconf.nm | 6 ++++- automake/automake.nm | 6 ++++- chrony/chrony.nm | 6 +++- cpufrequtils/cpufrequtils.nm | 5 ++- dracut/dracut.nm | 5 ++- glib2/glib2.nm | 6 ++-- icecream/icecream.nm | 49 ++++++++++++++++++++++++++++++----------- pcre/pcre.nm | 3 +- systemd/systemd.nm | 3 +- sysvinit/sysvinit.nm | 3 +- udev/udev.nm | 6 +++- xz/xz.nm | 4 ++- 12 files changed, 72 insertions(+), 30 deletions(-)
Difference in files: diff --git a/autoconf/autoconf.nm b/autoconf/autoconf.nm index e8fd519..295d64c 100644 --- a/autoconf/autoconf.nm +++ b/autoconf/autoconf.nm @@ -5,7 +5,7 @@
name = autoconf version = 2.68 -release = 1 +release = 2 arch = noarch
groups = Development/Tools @@ -33,5 +33,9 @@ end packages package %{name} requires = m4 + + filter_requires + perl>=[0-9]:.* + end end end diff --git a/automake/automake.nm b/automake/automake.nm index c25f1e9..05812d9 100644 --- a/automake/automake.nm +++ b/automake/automake.nm @@ -5,7 +5,7 @@
name = automake version = 1.11.1 -release = 1 +release = 2 arch = noarch
groups = Development/Tools @@ -31,5 +31,9 @@ end packages package %{name} requires = autoconf + + filter_requires + perl>=[0-9]:.* + end end end diff --git a/chrony/chrony.nm b/chrony/chrony.nm index 3ab23aa..c80e028 100644 --- a/chrony/chrony.nm +++ b/chrony/chrony.nm @@ -5,9 +5,9 @@
name = chrony version = 1.26 -release = 7 +release = 8
-groups = Base System/Daemons +groups = System/Daemons url = http://chrony.tuxfamily.org license = GPLv2 summary = An NTP client/server. @@ -73,6 +73,8 @@ end
packages package %{name} + groups += Base + configfiles /etc/chrony.conf /etc/chrony.keys diff --git a/cpufrequtils/cpufrequtils.nm b/cpufrequtils/cpufrequtils.nm index f8e1386..1695922 100644 --- a/cpufrequtils/cpufrequtils.nm +++ b/cpufrequtils/cpufrequtils.nm @@ -5,9 +5,9 @@
name = cpufrequtils version = 008 -release = 4 +release = 5
-groups = Base Applications/System +groups = Applications/System url = http://htop.sourceforge.net/ license = GPLv2 summary = Command line tools to determine current CPUfreq settings and to modify them @@ -30,6 +30,7 @@ end
packages package %{name} + groups += Base end package %{name}-devel diff --git a/dracut/dracut.nm b/dracut/dracut.nm index 8f2e5ce..bedfd4e 100644 --- a/dracut/dracut.nm +++ b/dracut/dracut.nm @@ -5,7 +5,7 @@
name = dracut version = 010 -release = 4 +release = 5 arch = noarch
groups = System/Boot @@ -53,6 +53,7 @@ packages libselinux lvm2 mdadm + multipath-tools sysvinit udev util-linux @@ -70,7 +71,7 @@ packages requires bridge-utils dhclient - iproute + iproute2 nfs-utils end diff --git a/glib2/glib2.nm b/glib2/glib2.nm index 792c03b..8030409 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -5,8 +5,8 @@
name = glib2 ver_major = 2.30 -version = %{ver_major}.0 -release = 2 +version = %{ver_major}.1 +release = 1 thisapp = glib-%{version}
groups = System/Libraries @@ -22,7 +22,7 @@ description object system. end
-source_dl = http://ftp.gnome.org/pub/gnome/sources/glib/%%7Bversion_major%7D/ +source_dl = http://ftp.gnome.org/pub/gnome/sources/glib/%%7Bver_major%7D/ sources = %{thisapp}.tar.xz
build diff --git a/icecream/icecream.nm b/icecream/icecream.nm index 793e1f5..dad6c99 100644 --- a/icecream/icecream.nm +++ b/icecream/icecream.nm @@ -3,12 +3,11 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-# XXX man pages are missing # XXX initscripts for daemons are missing
name = icecream -version = 0.9.6 -release = 3 +version = 0.9.7 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -16,19 +15,20 @@ url = http://en.opensuse.org/Icecream license = GPLv2+ summary = Distributed compiler.
- description - Icecream is a distributed compile system. It allows parallel compiling by \ - distributing the compile jobs to several nodes of a compile network running the \ - icecc daemon. The icecc scheduler routes the jobs and provides status and \ - statistics information to the icecc monitor. Each compile node can accept one \ - or more compile jobs depending on the number of processors and the settings of \ - the daemon. Link jobs and other jobs which cannot be distributed are executed \ + Icecream is a distributed compile system. It allows parallel compiling by + distributing the compile jobs to several nodes of a compile network running the + icecc daemon. The icecc scheduler routes the jobs and provides status and + statistics information to the icecc monitor. Each compile node can accept one + or more compile jobs depending on the number of processors and the settings of + the daemon. Link jobs and other jobs which cannot be distributed are executed locally on the node where the compilation is started. end
-source_dl = -sources = icecc-%{version}.tar.bz2 +source_dl = ftp://ftp.suse.com/pub/projects/icecream/ +sources = \ + icecc-%{version}.tar.bz2 \ + icecream-manpages.tar.bz2
build requires @@ -41,6 +41,13 @@ build --disable-static \ --enable-shared
+ prepare + cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/icecc-%{version}.tar.bz2 + cd %{DIR_APP} && %{MACRO_EXTRACT} %{DIR_DL}/icecream-manpages.tar.bz2 + + %{MACRO_PATCHES} + end + install_cmds ICECREAM_TARGET_PLATFORM=$(echo %{DISTRO_MACHINE} | sed -e "s/-gnu//g")
@@ -57,12 +64,28 @@ build
# create default working dir mkdir -pv %{BUILDROOT}/var/cache/icecream + + # install manpages + mkdir -pv %{BUILDROOT}/usr/share/man/man{1,7,8} + mv mans/scheduler.1 mans/icecc-scheduler.1 + for i in mans/*.1 mans/*.7; do + install -m 644 $i %{BUILDROOT}/usr/share/man/man${i##*.} + done + + # Remove unwanted symlinks. + rm -rvf %{BUILDROOT}/usr/bin/c++ + rm -rvf %{BUILDROOT}/usr/bin/cc + rm -rvf %{BUILDROOT}/usr/bin/g++ + rm -rvf %{BUILDROOT}/usr/bin/gcc end end
packages package %{name} - requires = gcc-c++ /usr/bin/ldd + requires + gcc-c++ + /usr/bin/ldd + end end package %{name}-devel diff --git a/pcre/pcre.nm b/pcre/pcre.nm index f51e459..64e4a4b 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -4,7 +4,7 @@ ###############################################################################
name = pcre -version = 8.13 +version = 8.20 release = 1
groups = System/Libraries @@ -30,6 +30,7 @@ build end
configure_options += \ + --disable-static \ --docdir=/usr/share/doc/pcre-%{version} \ --enable-utf8 \ --enable-pcregrep-libz \ diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 42aee74..129e8ba 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@
name = systemd version = 36 -release = 4 +release = 5
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -37,6 +37,7 @@ build libtool libudev-devel>=172 pam-devel + vala end
configure_options += \ diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm index 31f82c2..0a4a301 100644 --- a/sysvinit/sysvinit.nm +++ b/sysvinit/sysvinit.nm @@ -5,7 +5,7 @@
name = sysvinit version = 2.86 -release = 1 +release = 2
groups = System/Base url = https://alioth.debian.org/projects/pkg-sysvinit/ @@ -40,5 +40,6 @@ end
packages package %{name} + groups += Base end end diff --git a/udev/udev.nm b/udev/udev.nm index 9e9416e..f7375ab 100644 --- a/udev/udev.nm +++ b/udev/udev.nm @@ -5,9 +5,9 @@
name = udev version = 172 -release = 3 +release = 4
-groups = Base System/Base +groups = System/Base url = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ license = GPLv2+ summary = A userspace implementation of devfs. @@ -62,6 +62,8 @@ end
packages package %{name} + groups += Base + end
package lib%{name} template LIBS diff --git a/xz/xz.nm b/xz/xz.nm index 829cba6..1fdb24e 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -5,7 +5,7 @@
name = xz version = 5.0.3 -release = 3 +release = 4
groups = Applications/Compression url = http://tukaani.org/xz/ @@ -44,8 +44,10 @@ packages LZMA format. end license = GPLv2+ and LGPLv2+ + groups += Build
requires = %{name}=%{thisver} + provides = lzma
files /usr/bin/*lz*
hooks/post-receive -- IPFire 3.x development tree