From: Tomasz Pala Date: Sun, 27 Nov 2011 18:03:46 +0000 (+0000) Subject: - moved libsystemd libraries to %_lib (required by systemctl and X-Git-Tag: auto/th/udev-175-1~21 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=2310700683ed1f38d6cb3bbfd30b3981631e05d5;p=packages%2Fsystemd.git - moved libsystemd libraries to %_lib (required by systemctl and /lib/systemd/*, with systemd-uaccess R libsystemd-login only), - specified some minimal BR versions, sorted bconds, symlinks and %files, %attrs for libraries symlinks, other cosmetics Changed files: systemd.spec -> 1.37 --- diff --git a/systemd.spec b/systemd.spec index 3e18d9c..9e9c73f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -7,12 +7,12 @@ # /etc/vconsole.conf # # Conditional build: -%bcond_without gtk # build gtk tools (needs devel libnotify>=0.7 and gtk+2) -%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 +%bcond_without gtk # build gtk tools +%bcond_without pam # PAM authentication support +%bcond_without selinux # without SELinux support +%bcond_without tcpd # libwrap (tcp_wrappers) support Summary: A System and Service Manager Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa @@ -29,20 +29,22 @@ URL: http://www.freedesktop.org/wiki/Software/systemd BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.11 %{?with_cryptsetup:BuildRequires: cryptsetup-luks-devel} -BuildRequires: dbus-devel +BuildRequires: dbus-devel >= 1.3.2 BuildRequires: docbook-style-xsl -%{?with_gtk:BuildRequires: glib2-devel >= 1:2.26.1} +%if %{with gtk} +BuildRequires: glib2-devel >= 1:2.26.1 +BuildRequires: gtk+2-devel >= 2:2.24.0 +BuildRequires: libnotify-devel >= 0.7.0 +%endif BuildRequires: gperf -%{?with_gtk:BuildRequires: gtk+2-devel >= 2:2.24.0} BuildRequires: libcap-devel -%{?with_gtk:BuildRequires: libnotify-devel >= 0.7.0} %{?with_selinux:BuildRequires: libselinux-devel} BuildRequires: libtool >= 2:2.2 %{?with_tcpd:BuildRequires: libwrap-devel} BuildRequires: libxslt-progs BuildRequires: m4 %{?with_pam:BuildRequires: pam-devel} -BuildRequires: pkgconfig +BuildRequires: pkgconfig >= 0.9.0 BuildRequires: rpmbuild(macros) >= 1.527 BuildRequires: udev-devel >= 160 BuildRequires: vala >= 0.10.0 @@ -149,9 +151,12 @@ Pliki nagłówkowe bibliotek systemd. %install rm -rf $RPM_BUILD_ROOT + %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__mv} $RPM_BUILD_ROOT{%{_libdir}/lib%{name}-*.so*,/%{_lib}} + %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name} %{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la @@ -160,43 +165,30 @@ rm -rf $RPM_BUILD_ROOT # to shut up check-files rm -f $RPM_BUILD_ROOT%{_bindir}/systemadm rm -f $RPM_BUILD_ROOT%{_bindir}/systemd-gnome-ask-password-agent -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/systemadm.1* +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/systemadm.1* %endif # Create SysV compatibility symlinks. systemctl/systemd are smart # enough to detect in which way they are called. install -d $RPM_BUILD_ROOT/sbin ln -s ../bin/systemd $RPM_BUILD_ROOT/sbin/init -ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/reboot ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/halt ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/poweroff +ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/reboot +ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/shutdown ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit -ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel # We create all wants links manually at installation time to make sure # they are not owned and hence overriden by rpm after the used deleted # them. -rm -r $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants +%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/*.target.wants # Make sure these directories are properly owned -install -d $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants -install -d $RPM_BUILD_ROOT/lib/systemd/system/dbus.target.wants -install -d $RPM_BUILD_ROOT/lib/systemd/system/default.target.wants -install -d $RPM_BUILD_ROOT/lib/systemd/system/halt.target.wants -install -d $RPM_BUILD_ROOT/lib/systemd/system/kexec.target.wants -install -d $RPM_BUILD_ROOT/lib/systemd/system/poweroff.target.wants -install -d $RPM_BUILD_ROOT/lib/systemd/system/reboot.target.wants -install -d $RPM_BUILD_ROOT/lib/systemd/system/syslog.target.wants +install -d $RPM_BUILD_ROOT/lib/systemd/system/{basic,dbus,default,halt,kexec,poweroff,reboot,syslog}.target.wants # Create new-style configuration files so that we can ghost-own them -touch $RPM_BUILD_ROOT%{_sysconfdir}/hostname -touch $RPM_BUILD_ROOT%{_sysconfdir}/locale.conf -touch $RPM_BUILD_ROOT%{_sysconfdir}/machine-id -touch $RPM_BUILD_ROOT%{_sysconfdir}/machine-info -touch $RPM_BUILD_ROOT%{_sysconfdir}/os-release -touch $RPM_BUILD_ROOT%{_sysconfdir}/timezone -touch $RPM_BUILD_ROOT%{_sysconfdir}/vconsole.conf +touch $RPM_BUILD_ROOT%{_sysconfdir}/{hostname,locale.conf,machine-id,machine-info,os-release,timezone,vconsole.conf} %clean rm -rf $RPM_BUILD_ROOT @@ -269,8 +261,8 @@ fi %attr(755,root,root) /bin/systemd-machine-id-setup %attr(755,root,root) /bin/systemd-notify %attr(755,root,root) /bin/systemd-tty-ask-password-agent -%attr(755,root,root) %{_bindir}/systemd-cgls %attr(755,root,root) %{_bindir}/systemd-analyze +%attr(755,root,root) %{_bindir}/systemd-cgls %attr(755,root,root) %{_bindir}/systemd-nspawn %attr(755,root,root) %{_bindir}/systemd-stdio-bridge %attr(755,root,root) /sbin/halt @@ -281,10 +273,10 @@ fi %attr(755,root,root) /sbin/shutdown %attr(755,root,root) /sbin/telinit %attr(755,root,root) /lib/systemd/systemd-* -%attr(755,root,root) %{_libdir}/libsystemd-daemon.so.*.*.* -%ghost %{_libdir}/libsystemd-daemon.so.0 -%attr(755,root,root) %{_libdir}/libsystemd-login.so.*.*.* -%ghost %{_libdir}/libsystemd-login.so.0 +%attr(755,root,root) /%{_lib}/libsystemd-daemon.so.*.*.* +%attr(755,root,root) %ghost /%{_lib}/libsystemd-daemon.so.0 +%attr(755,root,root) /%{_lib}/libsystemd-login.so.*.*.* +%attr(755,root,root) %ghost /%{_lib}/libsystemd-login.so.0 %dir %{_libexecdir}/systemd %{_libexecdir}/systemd/user @@ -300,8 +292,8 @@ fi /lib/udev/rules.d/73-seat-late.rules %{_libexecdir}/tmpfiles.d/legacy.conf %{_libexecdir}/tmpfiles.d/systemd.conf -%{_libexecdir}/tmpfiles.d/x11.conf %{_libexecdir}/tmpfiles.d/tmp.conf +%{_libexecdir}/tmpfiles.d/x11.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml @@ -356,9 +348,9 @@ fi %{_mandir}/man5/systemd.target.5* %{_mandir}/man5/systemd.timer.5* %{_mandir}/man5/systemd.unit.5* -%{_mandir}/man5/vconsole.conf.5* %{_mandir}/man5/systemd-logind.conf.5* %{_mandir}/man5/timezone.5* +%{_mandir}/man5/vconsole.conf.5* %{_mandir}/man7/daemon.7* %{_mandir}/man7/sd-daemon.7* %{_mandir}/man7/sd-readahead.7* @@ -411,7 +403,7 @@ fi %files devel %defattr(644,root,root,755) %{_includedir}/systemd -%{_libdir}/libsystemd-daemon.so -%{_libdir}/libsystemd-login.so +%attr(755,root,root) /%{_lib}/libsystemd-daemon.so +%attr(755,root,root) /%{_lib}/libsystemd-login.so %{_pkgconfigdir}/libsystemd-daemon.pc %{_pkgconfigdir}/libsystemd-login.pc