diff --git a/hplip.spec b/hplip.spec index c66b56f..8a65980 100644 --- a/hplip.spec +++ b/hplip.spec @@ -48,10 +48,19 @@ BuildRequires: dbus-devel The Hewlett-Packard Linux Imaging and Printing Project provides drivers for HP printers and multi-function peripherals. +%package common +Summary: Files needed by the HPLIP printer and scanner drivers +Group: System Environment/Libraries +License: GPLv2+ + +%description common +Files needed by the HPLIP printer and scanner drivers. + %package libs Summary: HPLIP libraries Group: System Environment/Libraries License: GPLv2+ and MIT +Requires: %{name}-common = %{version}-%{release} %description libs Libraries needed by HPLIP. @@ -185,9 +194,6 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc COPYING doc/* -%{_sysconfdir}/udev/rules.d/* -%dir %{_sysconfdir}/hp -%config(noreplace) %{_sysconfdir}/hp/hplip.conf %{_bindir}/hp-align %{_bindir}/hp-clean %{_bindir}/hp-colorcal @@ -219,7 +225,6 @@ rm -rf %{buildroot} /usr/lib/cups/backend/hp /usr/lib/cups/backend/hpfax # Files -%dir %{_datadir}/hplip %{_datadir}/hplip/align.py* %{_datadir}/hplip/clean.py* %{_datadir}/hplip/colorcal.py* @@ -252,10 +257,8 @@ rm -rf %{buildroot} # Directories %{_datadir}/hplip/base %{_datadir}/hplip/copier -%dir %{_datadir}/hplip/data %{_datadir}/hplip/data/ldl %{_datadir}/hplip/data/localization -%{_datadir}/hplip/data/models %{_datadir}/hplip/data/pcl %{_datadir}/hplip/data/ps %{_datadir}/hplip/installer @@ -264,6 +267,15 @@ rm -rf %{buildroot} %{_datadir}/hplip/scan %{_localstatedir}/lib/hp +%files common +%defattr(-,root,root,-) +%{_sysconfdir}/udev/rules.d/* +%dir %{_sysconfdir}/hp +%config(noreplace) %{_sysconfdir}/hp/hplip.conf +%dir %{_datadir}/hplip +%dir %{_datadir}/hplip/data +%{_datadir}/hplip/data/models + %files libs %defattr(-,root,root) %{_libdir}/libhpip.so.* @@ -326,6 +338,7 @@ exit 0 %changelog * Tue Aug 25 2009 Tim Waugh 3.9.8-9 +- New common sub-package for udev rules and config file (bug #516459). - Don't install base/*.py with executable bit set. * Mon Aug 24 2009 Tim Waugh 3.9.8-8