[packages/systemd/DEVEL] - deal with qrencode and microhttpd support - systemd now uses its own pci ids

[qboosh]

commit e1921d8dd194f5c1cf322536a01e61adce1e5a78
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Nov 24 09:03:39 2012 +0100

    - deal with qrencode and microhttpd support
    - systemd now uses its own pci ids

 systemd.spec | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 57f5de9..ab4fbcd 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,4 +1,6 @@
 # TODO:
+# - restore sysconfig/clock support in target-pld patch
+#   [now systemd expects /etc/localtime to be symlink to /usr/share/zoneinfo/... unconditionally]
 # - pldize vconsole setup:
 # 	http://cgit.freedesktop.org/systemd/systemd/tree/src/vconsole/vconsole-setup.c
 # - udev initrd needs love (is probably completly unusable in current form)
@@ -7,7 +9,9 @@
 # Conditional build:
 %bcond_without	audit		# without audit support
 %bcond_without	cryptsetup	# without cryptsetup support
+%bcond_without	microhttpd	# microhttpd support
 %bcond_without	pam		# PAM authentication support
+%bcond_without	qrencode	# QRencode support
 %bcond_without	selinux		# without SELinux support
 %bcond_without	tcpd		# libwrap (tcp_wrappers) support
 
@@ -100,13 +104,14 @@ BuildRequires:	intltool >= 0.40.0
 BuildRequires:	kmod-devel >= 5
 BuildRequires:	libblkid-devel >= 2.20
 BuildRequires:	libcap-devel
-%{?with_selinux:BuildRequires:	libselinux-devel >= 2.1.0}
+BuildRequires:	libgcrypt-devel >= 1.4.5
+%{?with_microhttpd:BuildRequires:	libmicrohttpd-devel >= 0.9.5}
+%{?with_selinux:BuildRequires:	libselinux-devel >= 2.1.9}
 BuildRequires:	libtool >= 2:2.2
 %{?with_tcpd:BuildRequires:	libwrap-devel}
 BuildRequires:	libxslt-progs
 BuildRequires:	m4
 %{?with_pam:BuildRequires:	pam-devel}
-BuildRequires:	pciutils
 BuildRequires:	pkgconfig >= 0.9.0
 BuildRequires:	python-devel
 BuildRequires:	python-modules
@@ -125,10 +130,11 @@ BuildRequires:	glib2-static >= 1:2.22.0
 %{?with_klibc:BuildRequires:	klibc-static}
 BuildRequires:	kmod-libs-static >= 5
 BuildRequires:	libblkid-static >= 2.20
-%{?with_glibc:BuildRequires:	libselinux-static}
+%{?with_glibc:BuildRequires:	libselinux-static >= 2.1.9}
 %{?with_glibc:BuildRequires:	libsepol-static}
 %{?with_klibc:BuildRequires:	linux-libc-headers}
 BuildRequires:	pcre-static
+%{?with_qrencode:BuildRequires:	qrencode-devel}
 %{?with_uClibc:BuildRequires:	uClibc-static >= 4:0.9.30.3}
 BuildRequires:	xz-static
 BuildRequires:	zlib-static
@@ -138,6 +144,7 @@ Requires:	%{name}-units = %{epoch}:%{version}-%{release}
 Requires:	/etc/os-release
 Requires:	SysVinit-tools
 Requires:	agetty
+%{?with_cryptsetup:Requires:	cryptsetup >= 1.4.3}
 Requires:	dbus >= 1.4.16-6
 Requires:	filesystem >= 4.0-3
 Requires:	libutempter
@@ -363,6 +370,8 @@ start jednostek podczas rozruchu.
 Summary:	Shared systemd libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone systemd
 Group:		Libraries
+Requires:	libgcrypt >= 1.4.5
+%{?with_selinux:Requires:	libselinux >= 2.1.9}
 
 %description libs
 Shared systemd libraries.
@@ -439,6 +448,9 @@ Group:		Base
 Requires:	udev-libs = %{epoch}:%{version}-%{release}
 Requires:	coreutils
 Requires:	filesystem >= 3.0-45
+Requires:	kmod-libs >= 5
+Requires:	libblkid >= 2.20
+%{?with_selinux:Requires:	libselinux >= 2.1.9}
 Requires:	setup >= 2.6.1-1
 Requires:	uname(release) >= 2.6.32
 Conflicts:	rc-scripts < 0.4.5.3-1
@@ -605,14 +617,14 @@ patch -p1 <%{PATCH100}
 	--with-distro=pld \
 	--with-rootprefix="" \
 	--with-rootlibdir=/%{_lib} \
-	--disable-gudev \
-	--disable-keymap \
+	--disable-audit \
 	--disable-gtk-doc \
+	--disable-gudev \
 	--disable-introspection \
-	--with-pci-ids-path=%{_sysconfdir}/pci.ids \
-	--disable-audit \
+	--disable-keymap \
+	--disable-microhttpd \
 	--disable-pam \
-	--disable-plymouth \
+	--disable-qrencode \
 	--disable-selinux \
 	--enable-split-usr
 
@@ -647,24 +659,28 @@ patch -p1 -R <%{PATCH100}
 %endif
 
 %configure \
+	QUOTAON=/sbin/quotaon \
+	QUOTACHECK=/sbin/quotacheck \
+	SETCAP=/sbin/setcap \
+	KILL=/bin/kill \
 	%{?debug:--enable-debug} \
 	%{__enable_disable audit} \
 	%{__enable_disable cryptsetup libcryptsetup} \
 	%{__enable_disable pam} \
 	%{__enable_disable selinux} \
 	%{__enable_disable tcpd tcpwrap} \
-	--disable-plymouth \
+	%{!?with_microhttpd:--disable-microhttpd} \
+	%{!?with_qrencode:--disable-qrencode} \
 	--disable-silent-rules \
+	--enable-gtk-doc \
+	--enable-introspection \
+	--enable-split-usr \
 	--enable-shared \
 	--enable-static \
 	--with-distro=pld \
 	--with-rootprefix="" \
 	--with-rootlibdir=/%{_lib} \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-pci-ids-path=%{_sysconfdir}/pci.ids \
-	--enable-gtk-doc \
-	--enable-introspection \
-	--enable-split-usr
+	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
 ./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
@@ -996,6 +1012,7 @@ fi
 %attr(755,root,root) /lib/systemd/systemd-fsck
 %attr(755,root,root) /lib/systemd/systemd-hostnamed
 %attr(755,root,root) /lib/systemd/systemd-initctl
+%{?with_microhttpd:%attr(755,root,root) /lib/systemd/systemd-journal-gatewayd}
 %attr(755,root,root) /lib/systemd/systemd-journald
 %attr(755,root,root) /lib/systemd/systemd-localed
 %attr(755,root,root) /lib/systemd/systemd-logind
@@ -1048,6 +1065,7 @@ fi
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
 %dir %{_datadir}/systemd
+%{?with_microhttpd:%{_datadir}/systemd/gatewayd}
 %{_datadir}/systemd/kbd-model-map
 %{_mandir}/man1/hostnamectl.1*
 %{_mandir}/man1/journalctl.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/e1921d8dd194f5c1cf322536a01e61adce1e5a78