From 3288b873a5629b81037bba5f33e4e0b8feec5c0ba7458c40bc546fe0c73ac079 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 3 Sep 2015 11:16:05 +0000 Subject: [PATCH] Accepting request 324754 from home:fbui:branches:Base:System:cleanup Minor cleanups to the specfile OBS-URL: https://build.opensuse.org/request/show/324754 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=897 --- systemd-mini.changes | 10 +++++----- systemd-mini.spec | 19 ++++++------------- systemd.changes | 10 +++++----- systemd.spec | 19 ++++++------------- 4 files changed, 22 insertions(+), 36 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index c3e74d8f..51f92b72 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- -Fri Aug 21 13:04:55 UTC 2015 - fbui@suse.com +Fri Aug 21 07:49:33 UTC 2015 - fbui@suse.com -- installed systemd and udev packages should have the same version. - - These days udev and systemd are so related that it doesn't semm correct to - allow running systemd with udev having a different version. +- cleanup specfile by removing commands that were dealing with systemd + pre-generated files: we're now using systemd tarball generated directly + from the git repo which doesn't contain any of these files. +- there's no point in using LUA in %pretrans ------------------------------------------------------------------- Wed Aug 19 09:34:41 UTC 2015 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index b9cd6c85..8adddc31 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -101,7 +101,7 @@ BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(usbutils) >= 0.82 # the buildignore is important for bootstrapping #!BuildIgnore: udev -Requires: udev = %{version} +Requires: udev >= 172 Recommends: %{name}-bash-completion Requires: dbus-1 >= 1.4.0 Requires: kbd @@ -622,12 +622,6 @@ cp %{SOURCE7} m4/ %patch1098 -p1 %patch1099 -p1 -# remove patch backups -find -name '*.orig' -exec rm -f '{}' \+ - -# ensure generate files are removed -rm -f units/emergency.service - # # In combination with Patch352 set-and-use-default-logconsole.patch # Ensure that journald log on tty10 @@ -669,8 +663,7 @@ cflags () set +o noclobber } sh autogen.sh -# prevent pre-generated and distributed files from re-building -find . -name "*.[1-8]" -exec touch '{}' '+'; + export V=e export CFLAGS="%{optflags}" export LDFLAGS @@ -986,10 +979,10 @@ if [ $1 -eq 0 ]; then rm -f /etc/systemd/system/default.target 2>&1 || : fi -%pretrans -n udev%{?mini} -p -if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then - posix.symlink("/lib/udev", "/usr/lib/udev") -end +%pretrans -n udev%{?mini} +if test -e /lib/udev -a ! -e /usr/lib/udev; then + ln -s /lib/udev /usr/lib/udev +fi %pre -n udev%{?mini} if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then diff --git a/systemd.changes b/systemd.changes index c3e74d8f..51f92b72 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- -Fri Aug 21 13:04:55 UTC 2015 - fbui@suse.com +Fri Aug 21 07:49:33 UTC 2015 - fbui@suse.com -- installed systemd and udev packages should have the same version. - - These days udev and systemd are so related that it doesn't semm correct to - allow running systemd with udev having a different version. +- cleanup specfile by removing commands that were dealing with systemd + pre-generated files: we're now using systemd tarball generated directly + from the git repo which doesn't contain any of these files. +- there's no point in using LUA in %pretrans ------------------------------------------------------------------- Wed Aug 19 09:34:41 UTC 2015 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index fdb77937..476e8df2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -96,7 +96,7 @@ BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(usbutils) >= 0.82 # the buildignore is important for bootstrapping #!BuildIgnore: udev -Requires: udev = %{version} +Requires: udev >= 172 Recommends: %{name}-bash-completion Requires: dbus-1 >= 1.4.0 Requires: kbd @@ -617,12 +617,6 @@ cp %{SOURCE7} m4/ %patch1098 -p1 %patch1099 -p1 -# remove patch backups -find -name '*.orig' -exec rm -f '{}' \+ - -# ensure generate files are removed -rm -f units/emergency.service - # # In combination with Patch352 set-and-use-default-logconsole.patch # Ensure that journald log on tty10 @@ -664,8 +658,7 @@ cflags () set +o noclobber } sh autogen.sh -# prevent pre-generated and distributed files from re-building -find . -name "*.[1-8]" -exec touch '{}' '+'; + export V=e export CFLAGS="%{optflags}" export LDFLAGS @@ -981,10 +974,10 @@ if [ $1 -eq 0 ]; then rm -f /etc/systemd/system/default.target 2>&1 || : fi -%pretrans -n udev%{?mini} -p -if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then - posix.symlink("/lib/udev", "/usr/lib/udev") -end +%pretrans -n udev%{?mini} +if test -e /lib/udev -a ! -e /usr/lib/udev; then + ln -s /lib/udev /usr/lib/udev +fi %pre -n udev%{?mini} if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then