SHA256
1
0
forked from pool/systemd

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
This commit is contained in:
Dr. Werner Fink 2015-09-03 11:16:05 +00:00 committed by Git OBS Bridge
parent 2b0491c4bf
commit 3288b873a5
4 changed files with 22 additions and 36 deletions

View File

@ -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. - cleanup specfile by removing commands that were dealing with systemd
pre-generated files: we're now using systemd tarball generated directly
These days udev and systemd are so related that it doesn't semm correct to from the git repo which doesn't contain any of these files.
allow running systemd with udev having a different version. - there's no point in using LUA in %pretrans
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 19 09:34:41 UTC 2015 - fbui@suse.com Wed Aug 19 09:34:41 UTC 2015 - fbui@suse.com

View File

@ -101,7 +101,7 @@ BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(usbutils) >= 0.82 BuildRequires: pkgconfig(usbutils) >= 0.82
# the buildignore is important for bootstrapping # the buildignore is important for bootstrapping
#!BuildIgnore: udev #!BuildIgnore: udev
Requires: udev = %{version} Requires: udev >= 172
Recommends: %{name}-bash-completion Recommends: %{name}-bash-completion
Requires: dbus-1 >= 1.4.0 Requires: dbus-1 >= 1.4.0
Requires: kbd Requires: kbd
@ -622,12 +622,6 @@ cp %{SOURCE7} m4/
%patch1098 -p1 %patch1098 -p1
%patch1099 -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 # In combination with Patch352 set-and-use-default-logconsole.patch
# Ensure that journald log on tty10 # Ensure that journald log on tty10
@ -669,8 +663,7 @@ cflags ()
set +o noclobber set +o noclobber
} }
sh autogen.sh sh autogen.sh
# prevent pre-generated and distributed files from re-building
find . -name "*.[1-8]" -exec touch '{}' '+';
export V=e export V=e
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export LDFLAGS export LDFLAGS
@ -986,10 +979,10 @@ if [ $1 -eq 0 ]; then
rm -f /etc/systemd/system/default.target 2>&1 || : rm -f /etc/systemd/system/default.target 2>&1 || :
fi fi
%pretrans -n udev%{?mini} -p <lua> %pretrans -n udev%{?mini}
if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then if test -e /lib/udev -a ! -e /usr/lib/udev; then
posix.symlink("/lib/udev", "/usr/lib/udev") ln -s /lib/udev /usr/lib/udev
end fi
%pre -n udev%{?mini} %pre -n udev%{?mini}
if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then

View File

@ -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. - cleanup specfile by removing commands that were dealing with systemd
pre-generated files: we're now using systemd tarball generated directly
These days udev and systemd are so related that it doesn't semm correct to from the git repo which doesn't contain any of these files.
allow running systemd with udev having a different version. - there's no point in using LUA in %pretrans
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 19 09:34:41 UTC 2015 - fbui@suse.com Wed Aug 19 09:34:41 UTC 2015 - fbui@suse.com

View File

@ -96,7 +96,7 @@ BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(usbutils) >= 0.82 BuildRequires: pkgconfig(usbutils) >= 0.82
# the buildignore is important for bootstrapping # the buildignore is important for bootstrapping
#!BuildIgnore: udev #!BuildIgnore: udev
Requires: udev = %{version} Requires: udev >= 172
Recommends: %{name}-bash-completion Recommends: %{name}-bash-completion
Requires: dbus-1 >= 1.4.0 Requires: dbus-1 >= 1.4.0
Requires: kbd Requires: kbd
@ -617,12 +617,6 @@ cp %{SOURCE7} m4/
%patch1098 -p1 %patch1098 -p1
%patch1099 -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 # In combination with Patch352 set-and-use-default-logconsole.patch
# Ensure that journald log on tty10 # Ensure that journald log on tty10
@ -664,8 +658,7 @@ cflags ()
set +o noclobber set +o noclobber
} }
sh autogen.sh sh autogen.sh
# prevent pre-generated and distributed files from re-building
find . -name "*.[1-8]" -exec touch '{}' '+';
export V=e export V=e
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export LDFLAGS export LDFLAGS
@ -981,10 +974,10 @@ if [ $1 -eq 0 ]; then
rm -f /etc/systemd/system/default.target 2>&1 || : rm -f /etc/systemd/system/default.target 2>&1 || :
fi fi
%pretrans -n udev%{?mini} -p <lua> %pretrans -n udev%{?mini}
if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then if test -e /lib/udev -a ! -e /usr/lib/udev; then
posix.symlink("/lib/udev", "/usr/lib/udev") ln -s /lib/udev /usr/lib/udev
end fi
%pre -n udev%{?mini} %pre -n udev%{?mini}
if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then