Accepting request 1056227 from network:samba:STABLE

OBS-URL: https://build.opensuse.org/request/show/1056227
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=72
This commit is contained in:
Dominique Leuenberger 2023-01-07 16:15:53 +00:00 committed by Git OBS Bridge
commit 2771a50e5a
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 4 10:32:54 UTC 2023 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 17 13:29:37 UTC 2022 - palcantara@suse.de Mon Oct 17 13:29:37 UTC 2022 - palcantara@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package cifs-utils # spec file for package cifs-utils
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -137,7 +137,7 @@ done
export CFLAGS="%{optflags} -D_GNU_SOURCE -fpie" export CFLAGS="%{optflags} -D_GNU_SOURCE -fpie"
export LDFLAGS="-pie" export LDFLAGS="-pie"
autoreconf -i autoreconf -i
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
export ROOTSBINDIR="%{_sbindir}" export ROOTSBINDIR="%{_sbindir}"
%endif %endif
%configure \ %configure \
@ -187,7 +187,7 @@ if [ ! -f %{cifs_idmap_lib} ] ; then
fi fi
%files %files
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
%{_sbindir}/mount.cifs %{_sbindir}/mount.cifs
%{_sbindir}/mount.smb3 %{_sbindir}/mount.smb3
%else %else