pool/cifs-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 479998 from network:samba:STABLE

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/479998
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2017-03-18 19:49:21 +00:00 committed by Git OBS Bridge
commit a399899a79
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cifs-utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 7 16:54:59 UTC 2017 - aaptel@suse.com
- Get rid of init script on everything based off SLE12+ (bsc#1025471).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 2 15:31:14 UTC 2017 - aaptel@suse.com Thu Feb 2 15:31:14 UTC 2017 - aaptel@suse.com

20
cifs-utils.spec
View File

@ -34,10 +34,15 @@ Source100: README.cifstab.migration
%define NET_CFGDIR network-scripts %define NET_CFGDIR network-scripts
%endif %endif
Source1: cifs.init Source1: cifs.init
%if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} %if 0%{?suse_version} >= 1221
%define systemd 1
%else %else
PreReq: /sbin/chkconfig %define systemd 0
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1221
PreReq: insserv %{?fillup_prereq}
%endif %endif
%define initdir %{_sysconfdir}/init.d %define initdir %{_sysconfdir}/init.d
Provides: cifs-mount = %{version} Provides: cifs-mount = %{version}
@ -119,8 +124,11 @@ autoreconf -i
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
%install %install
%if ! %{systemd}
mkdir -p \ mkdir -p \
${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d
%endif
%{__make} install \ %{__make} install \
DESTDIR=${RPM_BUILD_ROOT} DESTDIR=${RPM_BUILD_ROOT}
%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1020 %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1020
@ -136,8 +144,12 @@ mkdir -p \
${RPM_BUILD_ROOT}/%{_sysconfdir}/samba \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/samba \
${RPM_BUILD_ROOT}/%{_sbindir} \ ${RPM_BUILD_ROOT}/%{_sbindir} \
${RPM_BUILD_ROOT}/%{_rundir} ${RPM_BUILD_ROOT}/%{_rundir}
%if ! %{systemd}
install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/cifs install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/cifs
ln -s service ${RPM_BUILD_ROOT}/%{_sbindir}/rccifs ln -s service ${RPM_BUILD_ROOT}/%{_sbindir}/rccifs
%endif
touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \
${RPM_BUILD_ROOT}%{_rundir}/cifs ${RPM_BUILD_ROOT}%{_rundir}/cifs
%endif %endif
@ -175,8 +187,10 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
%{_mandir}/man8/idmapwb.8.* %{_mandir}/man8/idmapwb.8.*
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221
%if ! %{systemd}
%attr(0754,root,root) %config %{_sysconfdir}/init.d/cifs %attr(0754,root,root) %config %{_sysconfdir}/init.d/cifs
%{_sbindir}/rccifs %{_sbindir}/rccifs
%endif
%dir %{_sysconfdir}/samba %dir %{_sysconfdir}/samba
%ghost %{_rundir}/cifs %ghost %{_rundir}/cifs
%endif %endif