- started update to 221

- libgudev moved out to separate package
- removed obsolete options

diff --git a/pld-boot_efi_mount.patch b/pld-boot_efi_mount.patch
index 19e75af5bcbee828eac1d62e4475186b16c114f9..0077d0c92acdca375c24caab58d14615f69be27a 100644 (file)
--- a/pld-boot_efi_mount.patch
+++ b/pld-boot_efi_mount.patch
@@ -5,8 +5,8 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator
                  return EXIT_SUCCESS;
          }
  
--        r = path_is_mount_point("/boot", true);
-+        r = path_is_mount_point("/boot/efi", true);
+-        r = path_is_mount_point("/boot", AT_SYMLINK_FOLLOW);
++        r = path_is_mount_point("/boot/efi", AT_SYMLINK_FOLLOW);
          if (r > 0) {
 -                log_debug("/boot is already a mount point, exiting.");
 +                log_debug("/boot/efi is already a mount point, exiting.");

diff --git a/root-lib.patch b/root-lib.patch
deleted file mode 100644 (file)
index c70aee1..0000000
--- a/root-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- systemd-220/src/shared/generator.c~        2015-05-15 17:06:10.000000000 +0200
-+++ systemd-220/src/shared/generator.c 2015-05-25 21:21:02.031196707 +0200
-@@ -61,7 +61,7 @@
-                 "[Service]\n"
-                 "Type=oneshot\n"
-                 "RemainAfterExit=yes\n"
--                "ExecStart=/usr/lib/systemd/systemd-fsck %2$s\n"
-+                "ExecStart=/lib/systemd/systemd-fsck %2$s\n"
-                 "TimeoutSec=0\n",
-                 program_invocation_short_name,
-                 what,

diff --git a/systemd.spec b/systemd.spec
index b4221f5cb3c366e2fb4e7bca0f9145d904241b6d..3d6ea0ff8e3627f4be9b919ade1a340ffbeca7b6 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -14,7 +14,6 @@
 %bcond_without pam             # PAM authentication support
 %bcond_without qrencode        # QRencode support
 %bcond_without selinux         # without SELinux support
-%bcond_without tcpd            # libwrap (tcp_wrappers) support
 %bcond_with    efi             # EFI boot support [missing files in 220]
 %bcond_with    tests           # "make check" (requires systemd already installed)
 
@@ -22,13 +21,13 @@ Summary:    A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:       220
-Release:       0.3
+Version:       221
+Release:       0.1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 Source0:       http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: 60acd92b04c0f5faa806678abd433014
+# Source0-md5: b4d5a253841cf28a98b7ec99c45e3716
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -67,7 +66,6 @@ Patch9:               systemd-configfs.patch
 Patch10:       pld-boot_efi_mount.patch
 Patch11:       optional-tmp-on-tmpfs.patch
 Patch12:       uids_gids.patch
-Patch13:       root-lib.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -87,7 +85,6 @@ BuildRequires:        glibc-misc
 BuildRequires: gnutls-devel >= 3.1.4
 BuildRequires: gobject-introspection-devel >= 1.31.1
 BuildRequires: gperf
-BuildRequires: gtk-doc >= 1.18
 BuildRequires: intltool >= 0.40.0
 BuildRequires: kmod-devel >= 14
 BuildRequires: libapparmor-devel
@@ -99,7 +96,6 @@ BuildRequires:        libmount-devel
 BuildRequires: libseccomp-devel >= 1.0.0
 %{?with_selinux:BuildRequires: libselinux-devel >= 2.1.9}
 BuildRequires: libtool >= 2:2.2
-%{?with_tcpd:BuildRequires:    libwrap-devel}
 BuildRequires: libxslt-progs
 BuildRequires: lz4-devel
 BuildRequires: m4
@@ -580,7 +576,6 @@ Plik nagłówkowy biblioteki libudev.
 Summary:       libudev API documentation
 Summary(pl.UTF-8):     Dokumentacja API libudev
 Group:         Documentation
-Requires:      gtk-doc-common
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -623,7 +618,6 @@ Plik nagłówkowy biblioteki libgudev.
 Summary:       libgudev API documentation
 Summary(pl.UTF-8):     Dokumentacja API libgudev
 Group:         Documentation
-Requires:      gtk-doc-common
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -681,14 +675,9 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
-# this file is autogenerated
-%{__rm} src/udev/keyboard-keys-from-name.gperf
-
 %build
-%{__gtkdocize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -707,22 +696,16 @@ cp -p %{SOURCE2} src/systemd_booted.c
        %{__enable_disable efi gnuefi} \
        %{__enable_disable pam} \
        %{__enable_disable selinux} \
-       %{__enable_disable tcpd tcpwrap} \
        %{__enable_disable microhttpd} \
        %{__enable_disable qrencode} \
        --disable-silent-rules \
-       --enable-chkconfig \
        --enable-compat-libs \
-       --enable-gtk-doc \
-       --enable-introspection \
        --enable-split-usr \
        --enable-lz4 \
-       --with-html-dir=%{_gtkdocdir} \
        --with-kbd-loadkeys=/usr/bin/loadkeys \
        --with-kbd-setfont=/bin/setfont \
        --with-sysvinit-path=/etc/rc.d/init.d \
        --with-sysvrcnd-path=/etc/rc.d \
-       --with-firmware-path=/lib/firmware \
        --with-rc-local-script-path-start=/etc/rc.d/rc.local \
        --with-rc-local-script-path-stop=/sbin/halt.local \
        --with-rootprefix="" \
@@ -2009,24 +1992,24 @@ fi
 
 %files -n udev-apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/libudev
-
-%files -n udev-glib
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgudev-1.0.so.0
-%{_libdir}/girepository-1.0/GUdev-1.0.typelib
-
-%files -n udev-glib-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgudev-1.0.so
-%{_includedir}/gudev-1.0
-%{_pkgconfigdir}/gudev-1.0.pc
-%{_datadir}/gir-1.0/GUdev-1.0.gir
+#%{_gtkdocdir}/libudev
 
-%files -n udev-glib-apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gudev
+#%files -n udev-glib
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/libgudev-1.0.so.*.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libgudev-1.0.so.0
+#%{_libdir}/girepository-1.0/GUdev-1.0.typelib
+#
+#%files -n udev-glib-devel
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/libgudev-1.0.so
+#%{_includedir}/gudev-1.0
+#%{_pkgconfigdir}/gudev-1.0.pc
+#%{_datadir}/gir-1.0/GUdev-1.0.gir
+#
+#%files -n udev-glib-apidocs
+#%defattr(644,root,root,755)
+#%{_gtkdocdir}/gudev
 
 %files -n bash-completion-udev
 %defattr(644,root,root,755)

diff --git a/uids_gids.patch b/uids_gids.patch
index d215e7d1b863a50e569b655db8f83277fff778c6..a837d5fa1593b34e60c5d54f433632842d2b482d 100644 (file)
--- a/uids_gids.patch
+++ b/uids_gids.patch
@@ -57,16 +57,14 @@ diff -dur systemd-218.orig/sysusers.d/systemd-remote.conf systemd-218/sysusers.d
 +u systemd-journal-upload  320 "systemd Journal Upload"
 --- systemd-220/sysusers.d/systemd.conf.m4~    2014-12-05 01:26:51.000000000 +0100
 +++ systemd-220/sysusers.d/systemd.conf.m4     2015-05-25 17:34:30.699429304 +0200
-@@ -5,16 +5,16 @@
+@@ -5,14 +5,14 @@
  #  the Free Software Foundation; either version 2.1 of the License, or
  #  (at your option) any later version.
  
 -g systemd-journal   - -
 +g systemd-journal   288 -
- m4_ifdef(`ENABLE_KDBUS',
 -u systemd-bus-proxy - "systemd Bus Proxy"
 +u systemd-bus-proxy 315 "systemd Bus Proxy"
- )m4_dnl
  m4_ifdef(`ENABLE_NETWORKD',
 -u systemd-network   - "systemd Network Management"
 +u systemd-network   316 "systemd Network Management"