%define _sbindir /sbin
-%define _moduledir %{_libdir}/security
+%if ! 0%{?_base_libdir:1}
+%define _base_libdir %{_libdir}
+%endif
+%define _moduledir %{_base_libdir}/security
%define _secconfdir %{_sysconfdir}/security
%define _pamconfdir %{_sysconfdir}/pam.d
BuildRequires: zlib-devel
BuildRequires: gettext-tools
BuildRequires: smack-devel
-BuildRequires: pkgconfig
Requires(post): /sbin/ldconfig
Requires(post): /usr/bin/install
Requires(postun): /sbin/ldconfig
%build
CFLAGS="-fPIC %{optflags} " ; export CFLAGS
%reconfigure \
- --libdir=%{_libdir} \
+ --libdir=%{_base_libdir} \
--includedir=%{_includedir}/security \
--enable-isadir=../..%{_moduledir} \
--disable-audit \
--with-db-uniquename=_pam \
- --with-libiconv-prefix=/usr \
+ --with-libiconv-prefix=%{_prefix} \
--enable-read-both-confs
%__make %{?_smp_flags} CFLAGS="$CFLAGS -lfl -lcrypt"
rm -f %{buildroot}%{_sysconfdir}/environment
for phase in auth acct passwd session ; do
- ln -sf pam_unix.so %{buildroot}%{_moduledir}/pam_unix_${phase}.so
+ ln -sf pam_unix.so %{buildroot}%{_moduledir}/pam_unix_${phase}.so
done
# Install default pam configuration files
%post
/sbin/ldconfig
-if [ ! -a /var/log/faillog ] ; then
- /usr/bin/install -m 600 /dev/null /var/log/faillog
+if [ ! -a %{_localstatedir}/log/faillog ] ; then
+ install -m 600 /dev/null %{_localstatedir}/log/faillog
fi
-if [ ! -a /var/log/tallylog ] ; then
- /usr/bin/install -m 600 /dev/null /var/log/tallylog
+if [ ! -a %{_localstatedir}/log/tallylog ] ; then
+ install -m 600 /dev/null %{_localstatedir}/log/tallylog
fi
%postun -p /sbin/ldconfig
%attr(0700,root,root) %{_sbindir}/unix_update
%attr(0755,root,root) %{_sbindir}/mkhomedir_helper
%config %{_sysconfdir}/security/limits.conf
-%{_libdir}/libpam.so.*
-%{_libdir}/libpam_misc.so.*
-%{_libdir}/libpamc.so.*
+%{_base_libdir}/libpam.so.*
+%{_base_libdir}/libpam_misc.so.*
+%{_base_libdir}/libpamc.so.*
%{_moduledir}/pam_deny.so
%{_moduledir}/pam_env.so
%{_moduledir}/pam_keyinit.so
%files devel
%manifest %{name}.manifest
%{_includedir}/security/*
-%{_libdir}/libpam.so
-%{_libdir}/libpam_misc.so
-%{_libdir}/libpamc.so
-%{_libdir}/security/pam_tally2.so
+%{_base_libdir}/libpam.so
+%{_base_libdir}/libpam_misc.so
+%{_base_libdir}/libpamc.so
+%{_moduledir}/pam_tally2.so
%docs_package
+%bcond_with kdbus
+%define release_flags %{?with_kdbus:+kdbus}
+
+# "enable foo" will turn into --enable-foo or --disable-foo
+# depending "with_foo" macro
+%define enable() %{expand:%%{?with_%{1}:--enable-%{1}}%%{!?with_%{1}:--disable-%{1}}}
+
+%define release_flags %{?with_kdbus:+kdbus}
+
%if ! 0%{?_rootprefix:1}
%define _rootprefix %{_prefix}
%endif
%define _rootlibdir %{_rootprefix}/lib
Name: systemd
-Version: 212
-Release: 0
+Version: 216
+Release: 0%{?release_flags}
# For a breakdown of the licensing, see README
License: LGPL-2.0+ and MIT and GPL-2.0+
Summary: A System and Service Manager
Group: Base/Startup
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
Source1: pamconsole-tmp.conf
+Source2: %{name}-rpmlintrc
Source1001: systemd.manifest
BuildRequires: gperf
BuildRequires: hwdata
intltoolize --force --automake
%reconfigure \
+ %{enable kdbus} \
--enable-compat-libs \
--enable-bootchart \
+ --disable-sysusers \
+ --disable-firstboot \
+ --disable-timesyncd \
+ --disable-resolved \
+ --disable-networkd \
--libexecdir=%{_prefix}/lib \
--docdir=%{_docdir}/systemd \
--disable-static \
touch %{buildroot}%{_sysconfdir}/machine-id
touch %{buildroot}%{_sysconfdir}/machine-info
touch %{buildroot}%{_sysconfdir}/timezone
-#mkdir -p %%{buildroot}%%{_sysconfdir}/X11/xorg.conf.d
-#touch %%{buildroot}%%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
mkdir -p %{buildroot}%{_rootprefix}/lib/systemd/system-preset/
mkdir -p %{buildroot}%{_rootprefix}/lib/systemd/user-preset/
rm -fr %{buildroot}%{_sysconfdir}/modprobe.d
rm -fr %{buildroot}%{_var}
+# Exclude ELF binaries
+rm -f %{buildroot}/%{_rootprefix}/lib/systemd/system-generators/systemd-debug-generator
+rm -f %{buildroot}/%{_prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator
+
+# end of install
%pre
getent group cdrom >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 11 cdrom >/dev/null 2>&1 || :
getent group tape >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 33 tape >/dev/null 2>&1 || :
%files
%manifest %{name}.manifest
-%config %{_sysconfdir}/systemd/bootchart.conf
%config %{_sysconfdir}/pam.d/systemd-user
%{_bindir}/bootctl
%{_bindir}/busctl
%dir %{_prefix}/lib/kernel/install.d
%{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
-%{_rootprefix}/lib/systemd/system-generators/systemd-efi-boot-generator
%{_bindir}/hostnamectl
%{_bindir}/localectl
-%{_bindir}/systemd-coredumpctl
+%{_bindir}/coredumpctl
%{_bindir}/timedatectl
%dir %{_sysconfdir}/systemd
%dir %{_sysconfdir}/systemd/system
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%config(noreplace) %{_sysconfdir}/systemd/bootchart.conf
+%config(noreplace) %{_sysconfdir}/systemd/coredump.conf
%config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/user.conf
%config(noreplace) %{_sysconfdir}/systemd/logind.conf
%config(noreplace) %{_sysconfdir}/systemd/journald.conf
%config(noreplace) %{_sysconfdir}/udev/udev.conf
-#%%{_sysconfdir}/bash_completion.d/systemd-bash-completion.sh
-%{_sysconfdir}/rpm/macros.systemd
%{_sysconfdir}/xdg/systemd
%ghost %config(noreplace) %{_sysconfdir}/hostname
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
%{_bindir}/systemd-detect-virt
%{_rootprefix}/bin/systemd-inhibit
%{_rootprefix}/bin/udevadm
+%{_rootprefix}/bin/systemd-escape
+%{_bindir}/systemd-path
%{_prefix}/lib/sysctl.d/*.conf
%{_rootprefix}/lib/systemd/systemd
%{_unitdir}
%dir %{_unitdir}/basic.target.wants
%dir %{_unitdir_user}
-%dir %{_prefix}/lib/systemd/network
+%dir %{_rootprefix}/lib/systemd/network
%{_unitdir_user}/basic.target
%{_unitdir_user}/bluetooth.target
%{_unitdir_user}/exit.target
%{_unitdir_user}/smartcard.target
%{_unitdir_user}/timers.target
%{_unitdir_user}/busnames.target
-%{_prefix}/lib/systemd/network/80-container-host0.network
-%{_prefix}/lib/systemd/network/99-default.link
+%if %{with kdbus}
+%{_rootprefix}/lib/systemd/user/systemd-bus-proxyd.socket
+%{_rootprefix}/lib/systemd/user/systemd-bus-proxyd@.service
+%endif
+%exclude %{_rootprefix}/lib/systemd/network/80-container-ve.network
+%exclude %{_rootprefix}/lib/systemd/network/80-container-host0.network
+%{_rootprefix}/lib/systemd/network/80-container-host0.network
+%{_rootprefix}/lib/systemd/network/99-default.link
+%exclude %{_rootprefix}/lib/systemd/system-preset/90-systemd.preset
%{_rootprefix}/lib/systemd/systemd-*
%dir %{_prefix}/lib/systemd/catalog
%{_prefix}/lib/systemd/catalog/systemd.catalog
%{_rootprefix}/lib/udev
+%{_rootprefix}/lib/systemd/system-generators/systemd-efi-boot-generator
%{_rootprefix}/lib/systemd/system-generators/systemd-getty-generator
%{_rootprefix}/lib/systemd/system-generators/systemd-fstab-generator
%{_rootprefix}/lib/systemd/system-generators/systemd-system-update-generator
%{_rootprefix}/lib/systemd/system-generators/systemd-gpt-auto-generator
+%if %{with kdbus}
+%{_rootprefix}/lib/systemd/system-generators/systemd-dbus1-generator
+%{_rootprefix}/lib/systemd/user-generators/systemd-dbus1-generator
+%endif
%{_prefix}/lib/tmpfiles.d/systemd.conf
%{_prefix}/lib/tmpfiles.d/x11.conf
%{_prefix}/lib/tmpfiles.d/tmp.conf
%{_prefix}/lib/tmpfiles.d/legacy.conf
%{_prefix}/lib/tmpfiles.d/pamconsole-tmp.conf
%{_prefix}/lib/tmpfiles.d/systemd-nologin.conf
+%{_prefix}/lib/tmpfiles.d/etc.conf
+%{_prefix}/lib/tmpfiles.d/systemd-remote.conf
+%{_prefix}/lib/tmpfiles.d/var.conf
%{_sbindir}/init
%{_sbindir}/reboot
%{_sbindir}/halt
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
-%{_datadir}/pkgconfig/systemd.pc
-%{_datadir}/pkgconfig/udev.pc
+%exclude %{_datadir}/factory/etc/nsswitch.conf
+%exclude %{_datadir}/factory/etc/pam.d/other
+%exclude %{_datadir}/factory/etc/pam.d/system-auth
# Make sure we don't remove runlevel targets from F14 alpha installs,
# but make sure we don't create then anew.
%{_rootlibdir}/libsystemd-journal.so.*
%{_rootlibdir}/libsystemd-login.so.*
%{_libdir}/libnss_myhostname.so.2
+%{_libdir}/libnss_mymachines.so.2
%files devel
%manifest %{name}.manifest
%{_libdir}/libsystemd-journal.so
%{_libdir}/libsystemd-login.so
%dir %{_includedir}/systemd
+%if %{with kdbus}
+%{_includedir}/systemd/sd-bus.h
+%{_includedir}/systemd/sd-bus-protocol.h
+%{_includedir}/systemd/sd-bus-vtable.h
+%{_includedir}/systemd/sd-event.h
+%{_includedir}/systemd/sd-path.h
+%{_includedir}/systemd/sd-resolve.h
+%{_includedir}/systemd/sd-rtnl.h
+%{_includedir}/systemd/sd-utf8.h
+%endif
+%{_includedir}/systemd/_sd-common.h
%{_includedir}/systemd/sd-daemon.h
-%{_includedir}/systemd/sd-login.h
-%{_includedir}/systemd/sd-journal.h
%{_includedir}/systemd/sd-id128.h
+%{_includedir}/systemd/sd-journal.h
+%{_includedir}/systemd/sd-login.h
%{_includedir}/systemd/sd-messages.h
-%{_includedir}/systemd/_sd-common.h
%{_includedir}/libudev.h
%{_libdir}/pkgconfig/libudev.pc
%{_libdir}/pkgconfig/libsystemd.pc
%{_libdir}/pkgconfig/libsystemd-id128.pc
%{_libdir}/pkgconfig/libsystemd-journal.pc
%{_libdir}/pkgconfig/libsystemd-login.pc
+%{_datadir}/pkgconfig/systemd.pc
+%{_datadir}/pkgconfig/udev.pc
+%config %{_sysconfdir}/rpm/macros.systemd
%files analyze
%manifest %{name}.manifest
%files -n libgudev
%manifest %{name}.manifest
-%{_rootlibdir}/libgudev-1.0.so.*
+%{_libdir}/libgudev-1.0.so.*
%files -n libgudev-devel
%manifest %{name}.manifest
%endif
%if %{with rdp}
-%define extra_config_options2 --enable-rdp-compositor
+%define extra_config_options2 --enable-rdp-compositor --enable-screen-sharing
%endif
%if "%{profile}" == "common"
%endif
Name: weston
-Version: 1.5.0
+Version: 1.6.0
Release: 0
Summary: Wayland Compositor Infrastructure
License: MIT
#Git-Clone: git://anongit.freedesktop.org/wayland/weston
#Git-Web: http://cgit.freedesktop.org/wayland/weston/
-Source0: %name-%version.tar.xz
-Source1: weston.target
-Source1001: weston.manifest
+Source0: %name-%version.tar.xz
+Source1: %name.target
+Source1001: %name.manifest
BuildRequires: autoconf >= 2.64, automake >= 1.11
BuildRequires: expat-devel
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
+%if !%{with mobile}
BuildRequires: pkgconfig(libdrm) >= 2.4.30
+%endif
BuildRequires: pkgconfig(libffi)
+BuildRequires: pkgconfig(libinput) >= 0.6.0
BuildRequires: pkgconfig(libsystemd-login)
BuildRequires: pkgconfig(libudev) >= 136
BuildRequires: pkgconfig(mtdev) >= 1.1.0
install -m 755 weston-simple-touch %{buildroot}%{_bindir}
install -m 755 weston-simple-shm %{buildroot}%{_bindir}
install -m 755 weston-simple-egl %{buildroot}%{_bindir}
+install -m 755 weston-simple-damage %{buildroot}%{_bindir}
install -m 755 weston-nested-client %{buildroot}%{_bindir}
install -m 755 weston-nested %{buildroot}%{_bindir}
install -m 755 weston-flower %{buildroot}%{_bindir}
install -m 755 weston-cliptest %{buildroot}%{_bindir}
install -m 755 weston-dnd %{buildroot}%{_bindir}
install -m 755 weston-editor %{buildroot}%{_bindir}
+install -m 755 weston-stacking %{buildroot}%{_bindir}
install -m 755 weston-smoke %{buildroot}%{_bindir}
+install -m 755 weston-scaler %{buildroot}%{_bindir}
install -m 755 weston-resizor %{buildroot}%{_bindir}
install -m 755 weston-eventdemo %{buildroot}%{_bindir}
install -m 755 weston-clickdot %{buildroot}%{_bindir}
%{_bindir}/weston-terminal
%{_libexecdir}/weston-*
%{_libdir}/weston/desktop-shell.so
+%if !%{with mobile}
%{_libdir}/weston/drm-backend.so
+%endif
%{_libdir}/weston/fbdev-backend.so
%{_libdir}/weston/fullscreen-shell.so
%{_libdir}/weston/headless-backend.so
%{_bindir}/weston-simple-touch
%{_bindir}/weston-simple-shm
%{_bindir}/weston-simple-egl
+%{_bindir}/weston-simple-damage
%{_bindir}/weston-nested-client
%{_bindir}/weston-nested
%{_bindir}/weston-flower
%{_bindir}/weston-cliptest
%{_bindir}/weston-dnd
%{_bindir}/weston-editor
+%{_bindir}/weston-stacking
%{_bindir}/weston-smoke
+%{_bindir}/weston-scaler
%{_bindir}/weston-resizor
%{_bindir}/weston-eventdemo
%{_bindir}/weston-clickdot
%files rdp
%manifest %{name}.manifest
%{_libdir}/weston/rdp-backend.so
+%{_libdir}/weston/screen-share.so
%endif
%changelog