rpms/stunnel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

clean up stale conditionals

Browse Source 
All but two of the `%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7`
conditionals were removed in 76c7fad (Fix systemd
executions/requirements, 2018-01-25).  Remove the others.

Remove Fedora version from `%if 0%{?fedora} > 27 || 0%{?rhel} > 7`.
Fedora 27 has been EOL since 2018-11-30.
This commit is contained in:
Todd Zullinger 2022-07-23 16:36:16 -04:00
parent a7dbee5dce
commit e4795e526b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stunnel.spec
View File

@ -1,7 +1,7 @@
# Do not generate provides for private libraries # Do not generate provides for private libraries
%global __provides_exclude_from ^%{_libdir}/stunnel/.*$ %global __provides_exclude_from ^%{_libdir}/stunnel/.*$
%if 0%{?fedora} > 27 || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%bcond_with libwrap %bcond_with libwrap
%else %else
%bcond_without libwrap %bcond_without libwrap
@ -97,11 +97,9 @@ for lang in pl ; do
done done
mkdir srpm-docs mkdir srpm-docs
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} srpm-docs cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} srpm-docs
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
cp %{buildroot}%{_datadir}/doc/stunnel/examples/%{name}.service %{buildroot}%{_unitdir}/%{name}.service cp %{buildroot}%{_datadir}/doc/stunnel/examples/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
cp %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service cp %{SOURCE7} %{buildroot}%{_unitdir}/%{name}@.service
%endif
%check %check
if ! make test; then if ! make test; then
@ -129,9 +127,7 @@ fi
%lang(pl) %{_mandir}/pl/man8/stunnel.8* %lang(pl) %{_mandir}/pl/man8/stunnel.8*
%dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}
%exclude %{_sysconfdir}/stunnel/* %exclude %{_sysconfdir}/stunnel/*
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%{_unitdir}/%{name}*.service %{_unitdir}/%{name}*.service
%endif
%{_datadir}/bash-completion/completions/%{name}.bash %{_datadir}/bash-completion/completions/%{name}.bash
%post %post
@ -148,6 +144,7 @@ fi
%changelog %changelog
* Sat Jul 23 2022 Todd Zullinger <tmz@pobox.com> - 5.62-5 * Sat Jul 23 2022 Todd Zullinger <tmz@pobox.com> - 5.62-5
- verify upstream source in %%prep - verify upstream source in %%prep
- clean up stale conditionals
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.62-4 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.62-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild