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 a47d9f66fd9a10ba35ec7d41e95d25ba00eabdb7 (commit) via e8ddf543feb411f68d02b500b63c01b00401f64b (commit) via 2cf9b9fc08728a2a4fa9f49cc6ffddf99fb4c4e7 (commit) via 580f1fd26720151408d5230f0756149a1e9a1415 (commit) via 101cdeb59144e85a1c8c4c0d1fecd3bc3abf5063 (commit) via 4cb374c5a3373d460435ddb2a462498b39f7abef (commit) via 98329963a3be9327a18042736dc77ce182dfc938 (commit) via c274af297bba00c9d0354059a1cb4e8b3681af42 (commit) from 119bafb39c948c42ed4fa3bce9168a45104ae1e7 (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 a47d9f66fd9a10ba35ec7d41e95d25ba00eabdb7 Merge: e8ddf54 4cb374c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 18 10:55:36 2012 +0100

Merge remote-tracking branch 'stevee/isdn4k-utils'

commit e8ddf543feb411f68d02b500b63c01b00401f64b Merge: 2cf9b9f c274af2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 18 10:54:43 2012 +0100

Merge remote-tracking branch 'stevee/docbook-dtds'

commit 2cf9b9fc08728a2a4fa9f49cc6ffddf99fb4c4e7 Merge: 580f1fd 9832996 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 18 10:54:21 2012 +0100

Merge remote-tracking branch 'stevee/audit'

commit 580f1fd26720151408d5230f0756149a1e9a1415 Merge: 119bafb 101cdeb Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 18 10:54:07 2012 +0100

Merge remote-tracking branch 'stevee/ImageMagic'

commit 101cdeb59144e85a1c8c4c0d1fecd3bc3abf5063 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 17 19:30:05 2012 +0100

ImageMagic: Update to 6.7.0-0.

This also fixes the build error on x86_64.

commit 4cb374c5a3373d460435ddb2a462498b39f7abef Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 17 18:42:40 2012 +0100

isdn4k-utils: Make package work on x86_64.

commit 98329963a3be9327a18042736dc77ce182dfc938 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 17 15:55:31 2012 +0100

audit: Update to 2.2.

Fixes #10066.

commit c274af297bba00c9d0354059a1cb4e8b3681af42 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 17 13:20:24 2012 +0100

docbook-dtds: Also prerequires sed and coreutils for scriptlet.

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

Summary of changes: ImageMagick/ImageMagick.nm | 4 ++-- audit/audit.nm | 4 ++-- docbook-dtds/docbook-dtds.nm | 4 +++- isdn4k-utils/isdn4k-utils.nm | 10 +++++----- .../isdn4k-utils-pppcapiplugin-libdir.patch | 9 +++++++++ 5 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch

Difference in files: diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm index c5d75ad..9750e2c 100644 --- a/ImageMagick/ImageMagick.nm +++ b/ImageMagick/ImageMagick.nm @@ -4,9 +4,9 @@ ###############################################################################

name = ImageMagick -version = 6.7.3 +version = 6.7.6 release = 1 -patchlevel = 3 +patchlevel = 0

groups = Application/Multimedia url = http://www.imagemagick.org/ diff --git a/audit/audit.nm b/audit/audit.nm index 239c63f..b62a978 100644 --- a/audit/audit.nm +++ b/audit/audit.nm @@ -4,8 +4,8 @@ ###############################################################################

name = audit -version = 2.1.3 -release = 8 +version = 2.2 +release = 1

groups = System/Daemons url = http://people.redhat.com/sgrubb/audit/ diff --git a/docbook-dtds/docbook-dtds.nm b/docbook-dtds/docbook-dtds.nm index 027da2f..eaf363c 100644 --- a/docbook-dtds/docbook-dtds.nm +++ b/docbook-dtds/docbook-dtds.nm @@ -5,7 +5,7 @@

name = docbook-dtds version = 1.0 -release = 5 +release = 6 arch = noarch

groups = Applications/Text @@ -119,7 +119,9 @@ end packages package %{name} prerequires + coreutils libxml2 + sed sgml-common end

diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm index ad636c1..38149ed 100644 --- a/isdn4k-utils/isdn4k-utils.nm +++ b/isdn4k-utils/isdn4k-utils.nm @@ -6,7 +6,7 @@ name = isdn4k-utils version = 3.2 devel_ver = CVS-2010-05-01 -release = 5 +release = 6 thisapp = %{name}-%{devel_ver}-patched

groups = Networking/Tools @@ -61,7 +61,7 @@ build echo "CONFIG_FAQ=y" >> .config echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >> .config echo "CONFIG_DATADIR='/usr/share/isdn'" >> .config - echo "LIBDIR='/usr/lib'" >> .config + echo "LIBDIR='%{libdir}'" >> .config echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config sed -e "s,',,g" .config > .config.h @@ -75,11 +75,11 @@ build

install mkdir -pv %{BUILDROOT}/usr/sbin - make install CFLAGS="%{CFLAGS}" DESTDIR="%{BUILDROOT}" + make install CFLAGS="%{CFLAGS}" LIBDIR="%{libdir}" DESTDIR="%{BUILDROOT}"

# Install udev rules for isdn. - mkdir -pv %{BUILDROOT}/lib/udev/rules.d/ - install -m 644 %{DIR_SOURCE}/40-isdn.rules %{BUILDROOT}/lib/udev/rules.d/ + mkdir -pv %{BUILDROOT}/%{lib}/udev/rules.d/ + install -m 644 %{DIR_SOURCE}/40-isdn.rules %{BUILDROOT}/%{lib}/udev/rules.d/

# Install config files for capi. mkdir -pv %{BUILDROOT}/etc diff --git a/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch b/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch new file mode 100644 index 0000000..133345b --- /dev/null +++ b/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch @@ -0,0 +1,9 @@ +diff -Nur a/pppdcapiplugin/Makefile.template b/pppdcapiplugin/Makefile.template +--- a/pppdcapiplugin/Makefile.template 2001-05-01 14:43:49.000000000 +0200 ++++ b/pppdcapiplugin/Makefile.template 2012-03-17 18:36:00.035594144 +0100 +@@ -8,7 +8,7 @@ + # as published by the Free Software Foundation; either version + # 2 of the License, or (at your option) any later version. + +-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) ++PLUGINDIR=${DESTDIR}${LIBDIR}/pppd/$(PPPVERSION)

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