pool/cntlm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Revert to state withou conflicts

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:proxy/cntlm?expand=0&rev=29
This commit is contained in:
Martin Pluskal 2016-03-02 12:11:47 +00:00 committed by Git OBS Bridge
parent 595c56fb3a
commit 76f4370b96
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cntlm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 2 12:11:26 UTC 2016 - mpluskal@suse.com
- Revert to state withou conflicts
-------------------------------------------------------------------
Sun Apr 26 11:22:30 UTC 2015 - mpluskal@suse.com

17
cntlm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package cntlm
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2007 Scorpio IT, Deidesheim, Germany
#
# All modifications and additions to the file contributed by third parties
@ -66,14 +66,12 @@ make %{?_smp_mflags}
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%if 0%{?suse_version} < 1230
install -d %{buildroot}%{_localstatedir}/run/%{name}
install -D -m 755 %{SOURCE1} %{buildroot}/%{_initddir}/%{name}
ln -s -f ../..%{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
%else
# With systemd, use new standard pid directory /run
install -d %{buildroot}/run/%{name}
install -d %{buildroot}%{_localstatedir}/run/%{name}
install -D -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
install -D -m 644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf
install -D -m 644 %{SOURCE4} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%endif
install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
@ -109,6 +107,11 @@ fi
%else
%fillup_only
%service_add_post %{name}.service
%if 0%{?suse_version} <= 1320
systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || :
%else
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%endif
%endif
%postun
@ -126,11 +129,9 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}.conf
%if 0%{?suse_version} < 1230
%config(noreplace) %{_initddir}/%{name}
%ghost %dir %attr(755,%{name},root) %{_localstatedir}/run/%{name}
%else
%{_unitdir}/%{name}.service
%dir %{_libexecdir}/tmpfiles.d
%{_libexecdir}/tmpfiles.d/%{name}.conf
%{_tmpfilesdir}/%{name}.conf
%ghost %dir %attr(755,%{name},root) /run/%{name}
%endif
%{_sbindir}/*