diff --git a/gutenprint.spec b/gutenprint.spec index 1f891ad..4c258c1 100644 --- a/gutenprint.spec +++ b/gutenprint.spec @@ -17,6 +17,10 @@ %bcond_with gtk2 %endif +# added in cups-1:2.4.7-3 +%{!?_cups_datadir:%global _cups_datadir %(/usr/bin/pkg-config --variable=cups_datadir cups)} +%{!?_cups_serverroot:%global _cups_serverroot %(/usr/bin/pkg-config --variable=cups_serverroot cups)} + Name: gutenprint Summary: Printer Drivers Package Version: 5.3.4 @@ -216,7 +220,7 @@ rm -rf %{buildroot}%{_datadir}/gutenprint/doc rm -f %{buildroot}%{_datadir}/foomatic/kitload.log rm -rf %{buildroot}%{_libdir}/gutenprint/%{majminver}/modules/*.la -rm -f %{buildroot}%{_sysconfdir}/cups/command.types +rm -f %{buildroot}%{_cups_serverroot}/command.types %find_lang %{name} sed 's!%{_datadir}/locale/\([^/]*\)/LC_MESSAGES/gutenprint.mo!%{_datadir}/locale/\1/gutenprint_\1.po!g' %{name}.lang >%{name}-po.lang @@ -300,8 +304,8 @@ exit 0 %files cups %doc -%{_datadir}/cups/calibrate.ppm -%{_datadir}/cups/usb/net.sf.gimp-print.usb-quirks +%{_cups_datadir}/calibrate.ppm +%{_cups_datadir}/usb/net.sf.gimp-print.usb-quirks %{_cups_serverbin}/filter/* %{_cups_serverbin}/driver/* %{_cups_serverbin}/backend/*