From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] systemd: Update to version 232.
Date: Thu, 01 Dec 2016 13:07:26 +0100
Message-ID: <1480594046-11729-1-git-send-email-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8357616691203185891=="
List-Id: <development.lists.ipfire.org>

--===============8357616691203185891==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

* Drop sub-package for compat-libs which will not be provided
  anymore since systemd 230.

* Drop sub-package for python binding, which have been moved to
  an own package.

* Remove unneeded file for X11 and ZSH.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 systemd/systemd.nm | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 760c38e..074440e 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -4,8 +4,8 @@
 ############################################################################=
###
=20
 name       =3D systemd
-version    =3D 231
-release    =3D 2
+version    =3D 232
+release    =3D 1
=20
 maintainer =3D Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     =3D System/Base
@@ -70,9 +70,7 @@ build
 		PYTHON=3D%{python3} \
 		--with-sysvinit-path=3D \
 		--with-sysvrcnd-path=3D \
-		--enable-introspection \
 		--enable-zlib \
-		--enable-compat-libs \
 		--disable-smack \
 		--disable-backlight \
 		--disable-firstboot \
@@ -86,7 +84,6 @@ build
 		--disable-timesyncd \
 		--disable-timedated \
 		--disable-polkit \
-		--disable-kdbus \
 		--disable-static
=20
 	prepare_cmds
@@ -147,9 +144,15 @@ build
 			ln -svf ../system/${i}.target ${i}.target || exit 1
 		done
=20
+		# Remove .so file for the shared library, it's not supposed to be used for=
 anything.
+		rm -rvf %{BUILDROOT}%{prefix}/lib/systemd/libsystemd-shared.so
+
 		# Remove tmpfile for X11
 		rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf
=20
+		# Drop X11 related config files
+		rm -rvf %{BUILDROOT}%{sysconfdir}/X11
+
 		# Remove unneeded stuff for xdg
 		rm -rfv %{BUILDROOT}/etc/xdg
=20
@@ -157,6 +160,9 @@ build
 		rm -rvf %{BUILDROOT}/etc/rpm
 		rm -rvf %{BUILDROOT}/usr/lib/rpm
=20
+		# Drop ZSH related files
+		rm -rvf %{BUILDROOT}%{datadir}/zsh
+
 		# Use journald. Enable the import of kernel messages.
 		# Stop forwarding to a syslog daemon.
 		sed \
@@ -350,6 +356,7 @@ packages
=20
 		obsoletes
 			nss-myhostname <=3D 0.3-3
+			systemd-compat-libs < 230
 		end
=20
 		conflicts
@@ -380,30 +387,9 @@ packages
 		end
 	end
=20
-	package %{name}-compat-libs
-		summary =3D systemd compatibility libraries.
-		description
-			Compatibility libraries for systemd. If your package requires this
-			package, you need to update your link options and build.
-		end
-
-		requires
-			%{name}-libs =3D %{thisver}
-		end
-
-		files
-			%{libdir}/libsystemd-daemon.so.*
-			%{libdir}/libsystemd-login.so.*
-			%{libdir}/libsystemd-journal.so.*
-			%{libdir}/libsystemd-id128.so.*
-		end
-	end
-
 	package %{name}-devel
 		template DEVEL
=20
-		requires +=3D %{name}-compat-libs =3D %{thisver}
-
 		files +=3D %{prefix}/lib/pakfire/macros/
 	end
=20
@@ -448,10 +434,6 @@ packages
 		end
 	end
=20
-	package python3-%{name}
-		template PYTHON3
-	end
-
 	package %{name}-debuginfo
 		template DEBUGINFO
 	end
--=20
2.7.4


--===============8357616691203185891==--