forked from pool/squid
- fix building with SLE12
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=235
This commit is contained in:
parent
abcd5831a0
commit
3761d61a9d
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 18 09:43:49 UTC 2021 - Adam Majer <adam.majer@suse.de>
|
||||||
|
|
||||||
|
- fix building with SLE12
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 11 21:54:04 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
Tue May 11 21:54:04 UTC 2021 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
11
squid.spec
11
squid.spec
@ -153,7 +153,7 @@ export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro,-z,now -pie"
|
|||||||
--disable-arch-native \
|
--disable-arch-native \
|
||||||
--enable-security-cert-generators \
|
--enable-security-cert-generators \
|
||||||
--enable-security-cert-validators
|
--enable-security-cert-validators
|
||||||
%make_build -O SAMBAPREFIX=%{_prefix}
|
make -O SAMBAPREFIX=%{_prefix} %{?_smp_mflags}
|
||||||
%if 0%{?suse_version} >= 1500
|
%if 0%{?suse_version} >= 1500
|
||||||
%sysusers_generate_pre %{SOURCE12} squid
|
%sysusers_generate_pre %{SOURCE12} squid
|
||||||
%endif
|
%endif
|
||||||
@ -200,9 +200,6 @@ for i in errors/*; do
|
|||||||
done
|
done
|
||||||
ln -sf %{_datadir}/%{name}/errors/en %{buildroot}%{squidconfdir}/errors
|
ln -sf %{_datadir}/%{name}/errors/en %{buildroot}%{squidconfdir}/errors
|
||||||
|
|
||||||
# fix file duplicates
|
|
||||||
%fdupes -s %{buildroot}%{_prefix}
|
|
||||||
|
|
||||||
# systemd
|
# systemd
|
||||||
install -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}.service
|
install -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}.service
|
||||||
install -D -m 755 %{SOURCE15} %{buildroot}%{squidlibexecdir}/cache_dir.sed
|
install -D -m 755 %{SOURCE15} %{buildroot}%{squidlibexecdir}/cache_dir.sed
|
||||||
@ -219,13 +216,15 @@ mkdir -p %{buildroot}%{_datadir}/snmp/mibs
|
|||||||
mv %{buildroot}%{_datadir}/squid/mib.txt \
|
mv %{buildroot}%{_datadir}/squid/mib.txt \
|
||||||
%{buildroot}%{_datadir}/snmp/mibs/SQUID-MIB.txt
|
%{buildroot}%{_datadir}/snmp/mibs/SQUID-MIB.txt
|
||||||
|
|
||||||
|
%if 0%{?suse_version} >= 1500
|
||||||
# Install sysusers file.
|
# Install sysusers file.
|
||||||
mkdir -p %{buildroot}%{_sysusersdir}
|
mkdir -p %{buildroot}%{_sysusersdir}
|
||||||
install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
|
install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/
|
||||||
|
%endif
|
||||||
|
|
||||||
%check
|
%check
|
||||||
# Fails in chroot environment
|
# Fails in chroot environment
|
||||||
%make_build check
|
make check %{?_smp_mflags}
|
||||||
|
|
||||||
%if 0%{?suse_version} >= 1500
|
%if 0%{?suse_version} >= 1500
|
||||||
%pre -f squid.pre
|
%pre -f squid.pre
|
||||||
@ -298,7 +297,9 @@ fi
|
|||||||
%dir %{_tmpfilesdir}
|
%dir %{_tmpfilesdir}
|
||||||
%dir %{_libexecdir}/%{name}
|
%dir %{_libexecdir}/%{name}
|
||||||
%{_tmpfilesdir}/squid.conf
|
%{_tmpfilesdir}/squid.conf
|
||||||
|
%if 0%{?suse_version} >= 1500
|
||||||
%{_sysusersdir}/squid-user.conf
|
%{_sysusersdir}/squid-user.conf
|
||||||
|
%endif
|
||||||
%config(noreplace) %{squidconfdir}/cachemgr.conf
|
%config(noreplace) %{squidconfdir}/cachemgr.conf
|
||||||
%config(noreplace) %{squidconfdir}/errorpage.css
|
%config(noreplace) %{squidconfdir}/errorpage.css
|
||||||
%config(noreplace) %{squidconfdir}/errors
|
%config(noreplace) %{squidconfdir}/errors
|
||||||
|
Loading…
Reference in New Issue
Block a user