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

remake of 1499261

Browse Source
This commit is contained in:
Zdenek Dohnal 2018-02-28 17:32:58 +01:00
parent a9212b54ae
commit 64bfa2dc8a
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cups.spec
View File

@ -15,7 +15,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 2.2.6
Release: 10%{?dist}
Release: 11%{?dist}
License: GPLv2
Url: http://www.cups.org/
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@ -428,13 +428,23 @@ done
# at /var/log/cups for users, whose are going to install CUPS on new OS
# machine with info message
%if 0%{?rhel} > 7 || 0%{?fedora} > 27
confignames=( "ErrorLog" "AccessLog" "PageLog" )
lognames=( "error_log" "access_log" "page_log" )
message="This CUPS log has been moved into journal by default unless changes have been made in /etc/cups/cups-files.conf. Log messages can be got by \"$ journalctl -u cups -e\""
for i in error_log access_log page_log
for ((i=0;i<${#confignames[@]};i++));
do
if [ ! -f %{_localstatedir}/log/cups/$i ]
found=`grep -i "${confignames[i]} syslog" /etc/cups/cups-files.conf`
if [ ! -z "$found" ]
then
%{_bindir}/touch %{_localstatedir}/log/cups/$i || :
%{_bindir}/echo $message >> %{_localstatedir}/log/cups/$i || :
if [ ! -f %{_localstatedir}/log/cups/${lognames[i]} ]
then
%{_bindir}/touch %{_localstatedir}/log/cups/${lognames[i]} || :
fi
lastmessage=`%{_bindir}/tail -n 1 %{_localstatedir}/log/cups/${lognames[i]} | grep "$message"`
if [ -z "$lastmessage" ]
then
%{_bindir}/echo $message >> %{_localstatedir}/log/cups/${lognames[i]} || :
fi
fi
done
%endif
@ -498,20 +508,6 @@ exit 0
[ $2 = 0 ] || exit 0
rm -f %{cups_serverbin}/backend/smb
# This trigger is for putting info message to /var/log/cups files, if user is
# going to update to newer OS
%if 0%{?rhel} > 7 || 0%{?fedora} > 27
%triggerin -- cups < 2.2.4-7
for i in error_log access_log page_log
do
if [ -f %{_localstatedir}/log/cups/$i ]
then
%{_bindir}/echo $message >> %{_localstatedir}/log/cups/$i || :
fi
done
exit 0
%endif
%files -f %{name}.lang
%doc README.md CREDITS.md CHANGES.md
%dir %attr(0755,root,lp) %{_sysconfdir}/cups
@ -661,6 +657,9 @@ exit 0
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
* Wed Feb 28 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-11
- remake of 1499261
* Wed Feb 28 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-10
- mention library names explicitly to warn about soname change