packages: systemd/systemd.spec, systemd/target-pld.patch (NEW) - add target...

[glen]

Author: glen                         Date: Sun Mar  6 21:28:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add target pld patch
- fix gtk deps

---- Files affected:
packages/systemd:
   systemd.spec (1.18 -> 1.19) , target-pld.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.18 packages/systemd/systemd.spec:1.19
--- packages/systemd/systemd.spec:1.18	Sun Mar  6 21:32:44 2011
+++ packages/systemd/systemd.spec	Sun Mar  6 22:28:28 2011
@@ -17,6 +17,7 @@
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
 # Source0-md5:	42a47d6fa60b7f3fe92fa22027713b32
+Patch0:	target-pld.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 %{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
@@ -24,7 +25,7 @@
 %{?with_crypt:BuildRequires:	cryptsetup-luks-devel}
 BuildRequires:	dbus-devel
 BuildRequires:	docbook-style-xsl
-BuildRequires:	gtk+2-devel
+%{?with_gtk:BuildRequires:	gtk+3-devel}
 BuildRequires:	libcap-devel
 %{?with_gtk:BuildRequires:	libnotify-devel >= 0.7}
 %{?with_selinux:BuildRequires:	libselinux-devel}
@@ -100,8 +101,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
@@ -112,10 +115,8 @@
 	%{__enable_disable selinux} \
 	%{__enable_disable tcpd tcpwrap} \
 	--disable-silent-rules \
-	--with-distro=other \
+	--with-distro=pld \
 	--with-syslog-service=syslog-ng \
-	--with-sysvinit-path=/etc/rc.d/init.d \
-	--with-sysvrcd-path=/etc/rc.d \
 	--with-rootdir=
 
 %{__make}
@@ -304,6 +305,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2011/03/06 21:28:28  glen
+- add target pld patch
+- fix gtk deps
+
 Revision 1.18  2011/03/06 20:32:44  glen
 - selinux, tcpd, pam, audit, cryptsetup bconds
 - bash-completion subpackage

================================================================
Index: packages/systemd/target-pld.patch
diff -u /dev/null packages/systemd/target-pld.patch:1.1
--- /dev/null	Sun Mar  6 22:28:33 2011
+++ packages/systemd/target-pld.patch	Sun Mar  6 22:28:28 2011
@@ -0,0 +1,15 @@
+--- systemd-18/configure.ac~	2011-02-16 23:12:09.000000000 +0200
++++ systemd-18/configure.ac	2011-03-06 23:24:39.486435579 +0200
+@@ -371,6 +371,12 @@
+                 AC_DEFINE(TARGET_ALTLINUX, [], [Target is ALTLinux])
+                 M4_DISTRO_FLAG=-DTARGET_ALTLINUX=1
+                 ;;
++        pld)
++                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
++                SYSTEM_SYSVRCND_PATH=/etc/rc.d
++                AC_DEFINE(TARGET_PLD, [], [Target is PLD Linux])
++                M4_DISTRO_FLAG=-DTARGET_PLD=1
++                ;;
+         other)
+                 AS_IF([test "x$with_syslog_service" = "x"],
+                         [AC_MSG_ERROR([With --distro=other, you must pass --with-syslog-service= to configure])])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.18&r2=1.19&f=u