diff --git a/systemd.spec b/systemd.spec index beee912..f350fbc 100644 --- a/systemd.spec +++ b/systemd.spec @@ -25,7 +25,7 @@ Name: systemd Epoch: 2 -Version: 234 +Version: 235 Release: 1mamba Summary: A system and service manager compatible with SysV and LSB init scripts Group: System/Configuration @@ -65,6 +65,7 @@ Patch16: systemd-232-i586-disable_restrict_address_families.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: iptables-devel BuildRequires: libacl-devel BuildRequires: libaudit-devel BuildRequires: libblkid-devel @@ -74,9 +75,7 @@ BuildRequires: libcryptsetup-devel BuildRequires: libcurl-devel BuildRequires: libdw-devel BuildRequires: libelf-devel -BuildRequires: libffi-devel BuildRequires: libgcrypt-devel -BuildRequires: libglib-devel BuildRequires: libgnutls-devel BuildRequires: libgpg-error-devel BuildRequires: libidn-devel @@ -85,19 +84,21 @@ BuildRequires: liblzma-devel BuildRequires: libmicrohttpd-devel BuildRequires: libmount-devel BuildRequires: libpam-devel -BuildRequires: libpcre-devel BuildRequires: libqrencode-devel +BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -BuildRequires: libsepol-devel -BuildRequires: libxkbcommon-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: vala-tools +BuildRequires: meson +BuildRequires: ninja Conflicts: sysvinit Conflicts: initscripts-sysv5 Requires: sysvinit-tools Requires: udev = %{?epoch:%epoch:}%{version}-%{release} Requires: kbd +Provides: laptop-mode-tools +Obsoletes: laptop-mode-tools BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -229,17 +230,37 @@ This package include development files for building software using udev librarie %patch16 -p1 %build -./autogen.sh -%configure \ - --with-rootprefix= \ - --with-rootlibdir=/%{_lib} \ - --with-pamlibdir=/%{_lib}/security \ - --with-tty-gid=4 \ - --enable-split-usr \ - --with-rc-local-script-path-start=/etc/rc.d/init.d/rc.local \ - --enable-compat-libs \ - --with-debug-shell=/bin/sh \ - KMOD=/sbin/kmod +#./autogen.sh +export LC_ALL=C.UTF-8 + +meson build \ + --build=release \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --sbindir=%{_sbindir} \ + --sysconfdir=%{_sysconfdir} \ + --datadir=%{_datadir} \ + --includedir=%{_includedir} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} \ + --localstatedir=%{_localstatedir} \ + --mandir=%{_mandir} \ + --infodir=%{_datadir}/info \ + -Drootlibdir=/%{_lib} \ + -Dpamlibdir=/%{_lib}/security \ + -Dtty-gid=4 \ + -Dsplit-usr=true \ + -Drc-local=/etc/rc.d/init.d/rc.local \ + -Ddebug-shell=/bin/sh \ + -Dsystem-uid-max=998 \ + -Dsystem-gid-max=998 \ + -Drpmmacrosdir=%{_sysconfdir}/rpm \ + -Dsupport-url="https://openmamba.org" + + +# KMOD=/sbin/kmod +# --enable-compat-libs \ + #sed -i "s|@rootlibdir@|/%{_lib}|" src/libudev/libudev.pc @@ -247,8 +268,10 @@ This package include development files for building software using udev librarie # --enable-terminal \ # --enable-kdbus \ -%make \ - rpmmacrosdir=%{_sysconfdir}/rpm +# LANG Workaround for meson error +export LANG="en_US.UTF-8" +export LC_ALL="en_US.UTF-8" +make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -293,12 +316,12 @@ ln -s libudev.so.1 %{buildroot}/%{_lib}/libudev.so.0 # fix libudev.so link since 232 #mv %{buildroot}/%{_lib}/libudev.la %{buildroot}%{_libdir}/ #rm -f %{buildroot}/%{_lib}/libudev.so -ln -sf /%{_lib}/libudev.la %{buildroot}%{_libdir}/libudev.la +#ln -sf /%{_lib}/libudev.la %{buildroot}%{_libdir}/libudev.la ln -sf /%{_lib}/libudev.so.1 %{buildroot}%{_libdir}/libudev.so # same for libsystemd.so #mv %{buildroot}/%{_lib}/libsystemd.la %{buildroot}%{_libdir}/ #rm -f %{buildroot}/%{_lib}/libsystemd.so -ln -sf /%{_lib}/libsystemd.la %{buildroot}%{_libdir}/libsystemd.la +#ln -sf /%{_lib}/libsystemd.la %{buildroot}%{_libdir}/libsystemd.la ln -sf /%{_lib}/libsystemd.so.0 %{buildroot}%{_libdir}/libsystemd.so # /etc/mtab symlink @@ -557,6 +580,7 @@ fi %exclude /lib/systemd/systemd-udevd /lib/udev/rules.d/99-systemd.rules %{_prefix}/lib/environment.d/99-environment.conf +%{_prefix}/lib/modprobe.d/systemd.conf %{_prefix}/lib/tmpfiles.d/*.conf %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.*.service @@ -630,9 +654,9 @@ fi %{_sysconfdir}/rpm/macros.systemd %dir %{_includedir}/systemd %{_includedir}/systemd/*.h -/%{_lib}/libsystemd.la +#/%{_lib}/libsystemd.la /%{_lib}/libsystemd.so -%{_libdir}/libsystemd.la +#%{_libdir}/libsystemd.la %{_libdir}/libsystemd.so #%{_libdir}/libsystemd-daemon.la #%{_libdir}/libsystemd-daemon.so @@ -642,7 +666,7 @@ fi #%{_libdir}/libsystemd-journal.so #%{_libdir}/libsystemd-login.la #%{_libdir}/libsystemd-login.so -/%{_lib}/libnss_*.la +#/%{_lib}/libnss_*.la #%{_libdir}/pkgconfig/libsystemd-daemon.pc #%{_libdir}/pkgconfig/libsystemd-id128.pc #%{_libdir}/pkgconfig/libsystemd-journal.pc @@ -679,7 +703,7 @@ fi /lib/udev/v4l_id %{_datadir}/pkgconfig/udev.pc %{_mandir}/man8/udevadm.8* -%doc LICENSE.GPL2 +#%doc LICENSE.GPL2 %files -n libudev %defattr(-,root,root) @@ -688,13 +712,17 @@ fi %files -n libudev-devel %defattr(-,root,root) %{_includedir}/libudev.h -/%{_lib}/libudev.la +#/%{_lib}/libudev.la /%{_lib}/libudev.so -%{_libdir}/libudev.la +#%{_libdir}/libudev.la %{_libdir}/libudev.so %{_libdir}/pkgconfig/libudev.pc %changelog +* Wed Nov 15 2017 Silvan Calarco 235-1mamba +- update to 235 +- provide/obsolete laptop-mode-tools + * Mon Aug 14 2017 Silvan Calarco 234-1mamba - update to 234