rpms/hplip/F-11 hplip.spec,1.224,1.225
Tim Waugh
twaugh at fedoraproject.org
Tue Aug 25 15:01:39 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30052
Modified Files:
hplip.spec
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
- New common sub-package for hal rules and config file (bug #516459).
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- hplip.spec 25 Aug 2009 11:09:03 -0000 1.224
+++ hplip.spec 25 Aug 2009 15:01:39 -0000 1.225
@@ -49,10 +49,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.
@@ -193,9 +202,6 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc COPYING doc/*
-%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
-%dir %{_sysconfdir}/hp
-%config(noreplace) %{_sysconfdir}/hp/hplip.conf
%{_bindir}/hp-align
%{_bindir}/hp-clean
%{_bindir}/hp-colorcal
@@ -227,7 +233,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*
@@ -260,10 +265,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
@@ -272,6 +275,15 @@ rm -rf %{buildroot}
%{_datadir}/hplip/scan
%{_localstatedir}/lib/hp
+%files common
+%defattr(-,root,root,-)
+%{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
+%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.*
@@ -334,6 +346,7 @@ exit 0
%changelog
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
+- New common sub-package for hal rules and config file (bug #516459).
- Don't install base/*.py with executable bit set.
* Mon Aug 24 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-8
More information about the scm-commits
mailing list