[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 54ff5e028f5127c2137e186e2baf4331c993d1e3

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 54ff5e028f5127c2137e186e2baf4331c993d1e3

[git]

[-- Attachment #1: Type: text/plain, Size: 3298 bytes --]

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  54ff5e028f5127c2137e186e2baf4331c993d1e3 (commit)
       via  74210e0492cb2150aac34d15a24ea3c40f265005 (commit)
       via  53a92667e0ff488be333a9c9590f432cfea9476b (commit)
       via  4990bf7fbcf6d8e21d71733d186b7df879d727b6 (commit)
      from  ff9f3da8eafb7934d94aca50900166a2b2b2d866 (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 54ff5e028f5127c2137e186e2baf4331c993d1e3
Merge: 74210e0 53a9266
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 8 13:05:50 2012 +0000

    Merge remote-tracking branch 'stevee/blkid-devel'

commit 74210e0492cb2150aac34d15a24ea3c40f265005
Merge: ff9f3da 4990bf7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 8 13:05:33 2012 +0000

    Merge remote-tracking branch 'stevee/systemd-update'

commit 53a92667e0ff488be333a9c9590f432cfea9476b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Oct 8 13:32:52 2012 +0200

    util-linux: libblkid-devel requires libuuid-devel.
    
    The blkid.pc files requires information from uuid.pc or will return an error to pkg-config. As a result of that, some packages doesn't build correctly.

commit 4990bf7fbcf6d8e21d71733d186b7df879d727b6
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Oct 7 12:26:35 2012 +0200

    systemd: Update to 194.

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

Summary of changes:
 systemd/systemd.nm       |    6 ++++--
 util-linux/util-linux.nm |    6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index b3575f6..a6dacb3 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = systemd
-version    = 187
-release    = 2
+version    = 194
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Base
@@ -41,8 +41,10 @@ build
 		libacl-devel
 		libblkid-devel
 		libcap-devel
+		libgcrypt-devel
 		libselinux-devel
 		libtool
+		libuuid-devel
 		pam-devel
 		pciutils-devel
 		usbutils
diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 2b1e441..040c415 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -6,7 +6,7 @@
 name       = util-linux
 major_ver  = 2.21
 version    = %{major_ver}
-release    = 3
+release    = 4
 
 groups     = System/Base
 url        = http://kernel.org/~kzak/util-linux/
@@ -149,6 +149,10 @@ packages
 		summary =  Development library and header of libblkid.
 		description = %{summary}
 
+		requires
+			libuuid-devel
+		end
+
 		files
 			%{includedir}/blkid/
 			%{libdir}/libblkid.so


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