packages: systemd/systemd.spec, systemd/target-pld.patch - updated to 43

[baggins]

Author: baggins                      Date: Thu Feb 16 10:58:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 43

---- Files affected:
packages/systemd:
   systemd.spec (1.117 -> 1.118) , target-pld.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.117 packages/systemd/systemd.spec:1.118
--- packages/systemd/systemd.spec:1.117	Thu Feb 16 11:53:20 2012
+++ packages/systemd/systemd.spec	Thu Feb 16 11:57:55 2012
@@ -17,12 +17,12 @@
 Summary:	A System and Service Manager
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
-Version:	42
+Version:	43
 Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5:	7686b44e368d2523901d3e903ed4dcea
+# Source0-md5:	446cc6db7625617af67e2d8e5f503a49
 Source1:	%{name}-sysv-convert
 Source2:	%{name}_booted.c
 Source3:	ifup at .service
@@ -697,6 +697,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118  2012/02/16 10:57:55  baggins
+- updated to 43
+
 Revision 1.117  2012/02/16 10:53:20  baggins
 - R /etc/os-release (http://lists.freedesktop.org/archives/systemd-devel/2012-February/004475.html)
 

================================================================
Index: packages/systemd/target-pld.patch
diff -u packages/systemd/target-pld.patch:1.4 packages/systemd/target-pld.patch:1.5
--- packages/systemd/target-pld.patch:1.4	Mon Jan 16 22:25:07 2012
+++ packages/systemd/target-pld.patch	Thu Feb 16 11:57:55 2012
@@ -66,14 +66,6 @@
 index 596a32a..f701bfd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -361,6 +361,7 @@ if test "z$with_distro" = "z"; then
-                 AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
-         else
-                 test -f "/etc/redhat-release" && with_distro="fedora"
-+                test -f "/etc/pld-release" && with_distro="pld"
-                 test -f "/etc/SuSE-release" && with_distro="suse"
-                 test -f "/etc/debian_version" &&  with_distro="debian"
-                 test -f "/etc/arch-release" && with_distro="arch"
 @@ -448,6 +449,12 @@ case $with_distro in
                  M4_DEFINES=-DTARGET_MANDRIVA=1
                  have_plymouth=yes
@@ -178,30 +170,6 @@
                  r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
                                     "ZONE", &zone,
                                     NULL);
-diff --git a/src/util.c b/src/util.c
-index da71e4d..0df1a7d 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -3599,6 +3599,19 @@ void status_welcome(void) {
-                         const_color = "0;34"; /* Blue for Fedora */
-         }
- 
-+#elif defined(TARGET_PLD)
-+
-+        if (!pretty_name) {
-+                if ((r = read_one_line_file("/etc/pld-release", &pretty_name)) < 0) {
-+
-+                        if (r != -ENOENT)
-+                                log_warning("Failed to read /etc/pld-release: %s", strerror(-r));
-+                }
-+        }
-+
-+        if (!ansi_color)
-+                const_color = "0;32"; /* Green for PLD */
-+
- #elif defined(TARGET_SUSE)
- 
-         if (!pretty_name) {
 diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
 index 9196789..1d1a916 100644
 --- a/src/vconsole/vconsole-setup.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.117&r2=1.118&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/target-pld.patch?r1=1.4&r2=1.5&f=u