Accepting request 297880 from home:pluskalm:branches:server:proxy

- Cleanup spec file with spec-cleaner
- Use url for source
- Correct unit file permissions, scriplet and rcservice
  symlink

OBS-URL: https://build.opensuse.org/request/show/297880
OBS-URL: https://build.opensuse.org/package/show/server:proxy/cntlm?expand=0&rev=25
This commit is contained in:
Martin Pluskal 2015-04-25 13:29:39 +00:00 committed by Git OBS Bridge
parent 0fbd03ff88
commit b054470f4c
2 changed files with 51 additions and 36 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Apr 12 20:03:45 UTC 2015 - mpluskal@suse.com
- Cleanup spec file with spec-cleaner
- Use url for source
- Correct unit file permissions, scriplet and rcservice
symlink
-------------------------------------------------------------------
Fri Mar 21 22:54:17 UTC 2014 - xrigou@otenet.gr

View File

@ -1,7 +1,7 @@
#
# spec file for package cntlm
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2007 Scorpio IT, Deidesheim, Germany
#
# All modifications and additions to the file contributed by third parties
@ -16,77 +16,83 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: cntlm
Summary: Fast NTLM authentication proxy with tunneling
Version: 0.92.3
Release: 1
Release: 0
Summary: Fast NTLM authentication proxy with tunneling
License: GPL-2.0+
Group: Productivity/Networking/Web/Proxy
Url: http://cntlm.sourceforge.net/
Source0: %{name}-%{version}.tar.bz2
Source0: http://sourceforge.net/projects/cntlm/files/cntlm/cntlm%{20}%{version}/%{name}-%{version}.tar.bz2
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.service
Source4: %{name}.tmpfiles
# PATCH-FIX-UPSTREAM cntlm-override-CFLAGS-CXXFLAGS-makefile.patch --fix empty debuginfo package
Patch0: cntlm-override-CFLAGS-CXXFLAGS-makefile.patch
Patch0: cntlm-override-CFLAGS-CXXFLAGS-makefile.patch
# PATCH-FIX-UPSTREAM cntlm-0.92.3-HTTP-1.1-persistent-connections-with-HTTP-1.0-clients.patch --cntlm doesn't handle correctly
# between HTTP-1.0 and HTTP-1.1
Patch1: cntlm-0.92.3-HTTP-1.1-persistent-connections-with-HTTP-1.0-clients.patch
%if %suse_version < 1230
Requires(pre): %insserv_prereq %fillup_prereq
Patch1: cntlm-0.92.3-HTTP-1.1-persistent-connections-with-HTTP-1.0-clients.patch
Requires(pre): grep
Requires(pre): pwdutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} < 1230
Requires(pre): %fillup_prereq
Requires(pre): %insserv_prereq
%else
Requires(pre): %fillup_prereq
BuildRequires: pkgconfig(systemd)
BuildRequires: systemd-rpm-macros
Requires(pre): %fillup_prereq
%{?systemd_requires}
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): pwdutils
Requires(pre): grep
%description
Cntlm is a fast and efficient NTLM proxy, with support for TCP/IP tunneling,
authenticated connection caching, ACLs, proper daemon logging and behaviour
and much more. It has up to ten times faster responses than similar NTLM
proxies, while using by orders or magnitude less RAM and CPU. Manual page
proxies, while using by orders or magnitude less RAM and CPU. Manual page
contains detailed information.
%prep
%setup -q -n %{name}-%{version}
%setup -q
%patch0 -p1
%patch1 -p0
%patch1
%build
%configure
make %{?_smp_mflags}
%install
%makeinstall
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%if %suse_version < 1230
%{__install} -d %{buildroot}/var/run/%{name}
%{__install} -D -m 755 %{S:1} %{buildroot}/%{_initrddir}/%{name}
%{__ln_s} -f ../..%{_sysconfdir}/init.d/%{name} %{buildroot}/usr/sbin/rc%{name}
%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 -m 755 %{S:3} %{buildroot}/%{_unitdir}/%{name}.service
%{__install} -D -m 644 %{S:4} %{buildroot}/usr/lib/tmpfiles.d/%{name}.conf
install -d %{buildroot}/run/%{name}
install -D -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
install -D -m 644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%endif
%{__install} -D -m 644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%pre
# on `rpm -ivh` PARAM is 1
# on `rpm -Uvh` PARAM is 2
# user cntlm
if [ -z "`%{_bindir}/getent passwd "%{name}"`" ]; then
%{_sbindir}/useradd -c "CNTLM Proxy Auth" -d /var/run/%{name} -g nogroup \
%{_sbindir}/useradd -c "CNTLM Proxy Auth" -d %{_localstatedir}/run/%{name} -g nogroup \
-r -s /bin/false %{name} 2>/dev/null;
fi
%if 0%{?suse_version} >= 1230
%service_add_pre %{name}.service
%endif
%preun
# on `rpm -e` PARAM is 0
%if %suse_version < 1230
%if 0%{?suse_version} < 1230
%stop_on_removal cntlm
%else
%service_del_preun %{name}.service
@ -98,18 +104,18 @@ fi
%post
# on `rpm -ivh` PARAM is 1
# on `rpm -Uvh` PARAM is 2
%if %suse_version < 1230
%if 0%{?suse_version} < 1230
%{fillup_and_insserv cntlm}
%else
%{fillup_only}
%fillup_only
%service_add_post %{name}.service
%endif
%postun
# on `rpm -e` PARAM is 0
%if %suse_version < 1230
%if 0%{?suse_version} < 1230
%restart_on_update cntlm
%{insserv_cleanup}
%insserv_cleanup
%else
%service_del_postun %{name}.service
%endif
@ -118,16 +124,17 @@ fi
%defattr(-,root,root,-)
%doc COPYRIGHT LICENSE README VERSION
%config(noreplace) %{_sysconfdir}/%{name}.conf
%if %suse_version < 1230
%config(noreplace) %{_initrddir}/%{name}
%ghost %dir %attr(755,%{name},root) /var/run/%{name}
%if 0%{?suse_version} < 1230
%config(noreplace) %{_initddir}/%{name}
%ghost %dir %attr(755,%{name},root) %{_localstatedir}/run/%{name}
%else
%config(noreplace) %{_unitdir}/%{name}.service
%{_unitdir}/%{name}.service
%dir %{_libexecdir}/tmpfiles.d
%{_libexecdir}/tmpfiles.d/%{name}.conf
%ghost %dir %attr(755,%{name},root) /run/%{name}
%endif
%{_sbindir}/*
%{_mandir}/man1/%{name}.1*
/var/adm/fillup-templates/sysconfig.%{name}
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%changelog