From 4c5b5ab66b0653878479588e0db8ed5bd3e7c831 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 6 Mar 2011 21:28:28 +0000 Subject: [PATCH] - add target pld patch - fix gtk deps Changed files: systemd.spec -> 1.19 target-pld.patch -> 1.1 --- systemd.spec | 9 +++++---- target-pld.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 target-pld.patch diff --git a/systemd.spec b/systemd.spec index 076bd89..3e8202a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,6 +16,7 @@ License: GPL v2+ 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 @@ -23,7 +24,7 @@ BuildRequires: automake %{?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} @@ -99,8 +100,10 @@ bash-completion for systemd. %prep %setup -q +%patch0 -p1 %build +%{__aclocal} -I m4 %{__autoconf} %{__automake} %configure \ @@ -111,10 +114,8 @@ bash-completion for systemd. %{__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} diff --git a/target-pld.patch b/target-pld.patch new file mode 100644 index 0000000..2ca9196 --- /dev/null +++ b/target-pld.patch @@ -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])]) -- 2.44.0