Dr. Werner Fink 2014-03-13 16:12:50 +00:00 committed by Git OBS Bridge
parent e7d12985f1
commit 46dab78993
4 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 13 15:43:19 UTC 2014 - werner@suse.de
- Avoid file conflict between udev and systemd (bnc# 868230)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de

View File

@ -1105,7 +1105,7 @@ exit 0
%dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/user
%dir %{_prefix}/lib/systemd/system %dir %{_prefix}/lib/systemd/system
%exclude %{_prefix}/lib/systemd/system/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/udev.service %exclude %{_prefix}/lib/systemd/system/*udev*.service
%exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service
%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 13 15:43:19 UTC 2014 - werner@suse.de
- Avoid file conflict between udev and systemd (bnc# 868230)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de

View File

@ -625,7 +625,8 @@ cp %{SOURCE7} m4/
%patch1023 -p1 %patch1023 -p1
%patch1999 -p1 %patch1999 -p1
%patch2000 -p1 %patch2000 -p1
%patch2001 -p1 ## DISABLED ... does not work even on little endian
##%patch2001 -p1
# udev patches # udev patches
%patch1034 -p0 %patch1034 -p0
%patch1035 -p0 %patch1035 -p0
@ -1100,7 +1101,7 @@ exit 0
%dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/user
%dir %{_prefix}/lib/systemd/system %dir %{_prefix}/lib/systemd/system
%exclude %{_prefix}/lib/systemd/system/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/udev.service %exclude %{_prefix}/lib/systemd/system/*udev*.service
%exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service
%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service