File project.diff of Package util-linux-systemd

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package util-linux-systemd

--- python-libmount.changes.orig
+++ python-libmount.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
+
+- don't conflict with sysvinit-tools in Tumblweed anymore. Needed for Leap 15
+  which wants to use a different release number scheme (lp150.x which produces
+  lower numbers than the conflict).
+
+-------------------------------------------------------------------
 Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
 
 - Prefer sysfs exported SMBIOS3 tables in lscu (bsc#1033718)
--- python-libmount.spec.orig
+++ python-libmount.spec
@@ -73,7 +73,7 @@ Name:           python-libmount
 %endif
 Summary:        %main_summary
 License:        GPL-2.0+
-Group:          %main_group
+Group:          %group_pl
 BuildRequires:  audit-devel
 BuildRequires:  bc
 BuildRequires:  binutils-devel
@@ -177,8 +177,10 @@ Obsoletes:      login < 4.0-33.7
 # File conflict of su and kill (up to 12.3 and SLE11).
 # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
 Conflicts:      coreutils < 8.21
+%if 0%{?suse_version} < 1330
 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
 Conflicts:      sysvinit-tools < 2.88+-87
+%endif
 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
 Conflicts:      bash-completion <= 2.1-10
 # The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775)
@@ -396,6 +398,7 @@ SMP systems.
 %if %build_util_linux
 %package -n python-libmount
 Summary:        %summary_pl
+License:        GPL-2.0+
 Group:          %group_pl
 
 %description -n python-libmount
--- util-linux-systemd.changes.orig
+++ util-linux-systemd.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
+
+- don't conflict with sysvinit-tools in Tumblweed anymore. Needed for Leap 15
+  which wants to use a different release number scheme (lp150.x which produces
+  lower numbers than the conflict).
+
+-------------------------------------------------------------------
 Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
 
 - Prefer sysfs exported SMBIOS3 tables in lscu (bsc#1033718)
--- util-linux-systemd.spec.orig
+++ util-linux-systemd.spec
@@ -177,8 +177,10 @@ Obsoletes:      login < 4.0-33.7
 # File conflict of su and kill (up to 12.3 and SLE11).
 # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
 Conflicts:      coreutils < 8.21
+%if 0%{?suse_version} < 1330
 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
 Conflicts:      sysvinit-tools < 2.88+-87
+%endif
 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
 Conflicts:      bash-completion <= 2.1-10
 # The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775)
--- util-linux.changes.orig
+++ util-linux.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Sun Jun 11 12:12:44 UTC 2017 - lnussel@suse.de
+
+- don't conflict with sysvinit-tools in Tumblweed anymore. Needed for Leap 15
+  which wants to use a different release number scheme (lp150.x which produces
+  lower numbers than the conflict).
+
+-------------------------------------------------------------------
 Wed Apr 12 09:19:21 UTC 2017 - agraf@suse.com
 
 - Prefer sysfs exported SMBIOS3 tables in lscu (bsc#1033718)
--- util-linux.spec.orig
+++ util-linux.spec
@@ -177,8 +177,10 @@ Obsoletes:      login < 4.0-33.7
 # File conflict of su and kill (up to 12.3 and SLE11).
 # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
 Conflicts:      coreutils < 8.21
+%if 0%{?suse_version} < 1330
 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
 Conflicts:      sysvinit-tools < 2.88+-87
+%endif
 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
 Conflicts:      bash-completion <= 2.1-10
 # The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775)

Places

File project.diff of Package util-linux-systemd

Places