rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Move PPDs requiring hpps to the main package along with the filter itself (bug #1194186).

Browse Source 
Resolves: rhbz#1194186
This commit is contained in:
Tim Waugh 2015-03-03 13:12:24 +00:00
parent 5da93b90f8
commit b39bba9f08
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hplip.spec
View File

@ -324,7 +324,24 @@ rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff*
# window), so don't ship the launcher yet. # window), so don't ship the launcher yet.
rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%files # Sort out which PPDs go into which subpackage.
# The ones that use hpps have to go into the main package (bug #1194186).
find %{buildroot}%{_datadir}/ppd -type f | \
(while read fname
do
if zgrep -q '^\*cupsFilter.* hpps' "$fname"
then
which=0
else
which=1
fi
printf "$which %s\n" "$fname"
done) > ppds-all
sed -ne "s,^0 %{buildroot},,p" ppds-all > ppds-hpps
sed -ne "s,^1 %{buildroot},,p" ppds-all > ppds-nohpps
rm -f ppds-all
%files -f ppds-hpps
%doc COPYING doc/* %doc COPYING doc/*
%{_bindir}/hp-align %{_bindir}/hp-align
%{_bindir}/hp-clean %{_bindir}/hp-clean
@ -354,6 +371,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_bindir}/hp-wificonfig %{_bindir}/hp-wificonfig
%{_cups_serverbin}/backend/hp %{_cups_serverbin}/backend/hp
%{_cups_serverbin}/backend/hpfax %{_cups_serverbin}/backend/hpfax
%{_cups_serverbin}/filter/hpps
%{_cups_serverbin}/filter/pstotiff %{_cups_serverbin}/filter/pstotiff
%{_datadir}/cups/mime/pstotiff.convs %{_datadir}/cups/mime/pstotiff.convs
# Files # Files
@ -435,15 +453,13 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_datadir}/hplip/data/images %{_datadir}/hplip/data/images
%{_datadir}/hplip/ui4 %{_datadir}/hplip/ui4
%files -n hpijs %files -n hpijs -f ppds-nohpps
%{_bindir}/hpijs %{_bindir}/hpijs
%{_bindir}/hpcups-update-ppds %{_bindir}/hpcups-update-ppds
%dir %{_datadir}/ppd/HP %dir %{_datadir}/ppd/HP
%{_datadir}/ppd/HP/*.ppd.gz
%{_datadir}/cups/drv/* %{_datadir}/cups/drv/*
%{_cups_serverbin}/filter/hpcups %{_cups_serverbin}/filter/hpcups
%{_cups_serverbin}/filter/hpcupsfax %{_cups_serverbin}/filter/hpcupsfax
%{_cups_serverbin}/filter/hpps
%files -n libsane-hpaio %files -n libsane-hpaio
%{_libdir}/sane/libsane-*.so* %{_libdir}/sane/libsane-*.so*
@ -458,6 +474,8 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%changelog %changelog
* Tue Mar 3 2015 Tim Waugh <twaugh@redhat.com> - 3.15.2-3 * Tue Mar 3 2015 Tim Waugh <twaugh@redhat.com> - 3.15.2-3
- Move PPDs requiring hpps to the main package along with the filter
itself (bug #1194186).
- Don't try to write bytecode cache for hpfax backend (bug #1192761). - Don't try to write bytecode cache for hpfax backend (bug #1192761).
* Thu Feb 12 2015 Tim Waugh <twaugh@redhat.com> - 3.15.2-2 * Thu Feb 12 2015 Tim Waugh <twaugh@redhat.com> - 3.15.2-2