packages: systemd/systemd.spec - selinux, tcpd, pam, audit, cryptsetup bcon...

[glen]

Author: glen                         Date: Sun Mar  6 20:32:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- selinux, tcpd, pam, audit, cryptsetup bconds
- bash-completion subpackage

---- Files affected:
packages/systemd:
   systemd.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.17 packages/systemd/systemd.spec:1.18
--- packages/systemd/systemd.spec:1.17	Sun Mar  6 21:06:50 2011
+++ packages/systemd/systemd.spec	Sun Mar  6 21:32:44 2011
@@ -1,11 +1,12 @@
 # $Revision$, $Date$
-# TODO:
-# - gtk BRs: libnotify 0.7 and gtk+3
-# - subpackages: bash-autocompletion, dbus(?), gtk, others?
-# - more BRs
 #
 # Conditional build:
-%bcond_with	gtk	# build gtk tools
+%bcond_with		gtk	# build gtk tools (needs devel libnotify>=0.7 and gtk+3)
+%bcond_without	selinux		# without SELinux support
+%bcond_without	tcpd		# libwrap (tcp_wrappers) support
+%bcond_without	pam			# PAM authentication support
+%bcond_without	audit		# without audit support
+%bcond_without	cryptsetup	# without cryptsetup support
 
 Summary:	A System and Service Manager
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
@@ -17,21 +18,22 @@
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2
 # Source0-md5:	42a47d6fa60b7f3fe92fa22027713b32
 URL:		http://www.freedesktop.org/wiki/Software/systemd
-BuildRequires:	audit-libs-devel
+%{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	cryptsetup-luks-devel
+%{?with_crypt:BuildRequires:	cryptsetup-luks-devel}
 BuildRequires:	dbus-devel
 BuildRequires:	docbook-style-xsl
 BuildRequires:	gtk+2-devel
 BuildRequires:	libcap-devel
 %{?with_gtk:BuildRequires:	libnotify-devel >= 0.7}
-BuildRequires:	libselinux-devel
-BuildRequires:	libtool
-BuildRequires:	libwrap-devel
+%{?with_selinux:BuildRequires:	libselinux-devel}
+BuildRequires:	libtool >= 2:2.2
+%{?with_tcpd:BuildRequires:	libwrap-devel}
 BuildRequires:	libxslt
-BuildRequires:	pam-devel
+%{?with_pam:BuildRequires:	pam-devel}
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.527
 BuildRequires:	udev-devel >= 160
 BuildRequires:	vala >= 0.11
 Requires:	%{name}-units = %{version}-%{release}
@@ -87,6 +89,15 @@
 %description gtk
 Graphical front-end for systemd.
 
+%package -n bash-completion-systemd
+Summary:	bash-completion for systemd
+Group:		Applications/Shells
+Requires:	%{name}
+Requires:	bash-completion
+
+%description -n bash-completion-systemd
+bash-completion for systemd.
+
 %prep
 %setup -q
 
@@ -94,8 +105,14 @@
 %{__autoconf}
 %{__automake}
 %configure \
+	%{__enable_disable audit} \
+	%{__enable_disable cryptsetup libcryptsetup} \
+	%{__enable_disable gtk} \
+	%{__enable_disable pam} \
+	%{__enable_disable selinux} \
+	%{__enable_disable tcpd tcpwrap} \
+	--disable-silent-rules \
 	--with-distro=other \
-	--%{?with_gtk:en}%{!?with_gtk:dis}able-gtk \
 	--with-syslog-service=syslog-ng \
 	--with-sysvinit-path=/etc/rc.d/init.d \
 	--with-sysvrcd-path=/etc/rc.d \
@@ -108,7 +125,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT '(' -name '*.a' -o -name '*.la' ')' | xargs rm -v
+find $RPM_BUILD_ROOT '(' -name '*.a' -o -name '*.la' ')' | xargs -r rm -v
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -199,9 +216,7 @@
 %dir /lib/systemd
 /lib/systemd/systemd-*
 %dir /lib/systemd/system-generators
-/lib/systemd/system-generators/systemd-cryptsetup-generator
 /lib/udev/rules.d/99-systemd.rules
-%attr(755,root,root) /%{_lib}/security/pam_systemd.so
 %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
 %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
@@ -242,13 +257,21 @@
 %{_mandir}/man7/sd-readahead.7*
 %{_mandir}/man7/systemd.special.7*
 %{_mandir}/man8/halt.8*
-%{_mandir}/man8/pam_systemd.8*
 %{_mandir}/man8/poweroff.8
 %{_mandir}/man8/reboot.8
 %{_mandir}/man8/runlevel.8*
 %{_mandir}/man8/shutdown.8*
 %{_mandir}/man8/telinit.8*
 
+%if %{with cryptsetup}
+/lib/systemd/system-generators/systemd-cryptsetup-generator
+%endif
+
+%if %{with pam}
+%attr(755,root,root) /%{_lib}/security/pam_systemd.so
+%{_mandir}/man8/pam_systemd.8*
+%endif
+
 %files units
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/systemd
@@ -271,12 +294,20 @@
 %{_mandir}/man1/systemadm.1*
 %endif
 
+%files -n bash-completion-systemd
+%defattr(644,root,root,755)
+/etc/bash_completion.d/systemctl-bash-completion.sh
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2011/03/06 20:32:44  glen
+- selinux, tcpd, pam, audit, cryptsetup bconds
+- bash-completion subpackage
+
 Revision 1.17  2011/03/06 20:06:50  glen
 - up to 18, units, gtk subpackages
 
================================================================

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