diff --git a/sane-backends.spec b/sane-backends.spec index d81002f..88c760f 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.22 -Release: 3%{?dist} +Release: 4%{?dist} # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain # see LICENSE for details @@ -37,6 +37,8 @@ BuildRequires: gettext BuildRequires: gphoto2-devel Requires: udev >= 143 Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: sane-backends < 1.0.22-4 +Conflicts: sane-backends < 1.0.22-4 %description Scanner Access Now Easy (SANE) is a universal scanner interface. The @@ -44,23 +46,6 @@ SANE application programming interface (API) provides standardized access to any raster image scanner hardware (flatbed scanner, hand-held scanner, video and still cameras, frame-grabbers, etc.). -%package devel -Summary: SANE development toolkit -Group: Development/Libraries -Requires: sane-backends = %{version}-%{release} -Requires: libusb-devel -Requires: libieee1284-devel -Requires: libjpeg-devel -Requires: libtiff-devel -Requires: pkgconfig -Requires: gphoto2-devel -Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: sane-backends-libs-gphoto2%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -This package contains libraries and header files for writing Scanner Access Now -Easy (SANE) modules. - %package libs Summary: SANE libraries Group: System Environment/Libraries @@ -73,14 +58,44 @@ Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release} This package contains the SANE libraries which are needed by applications that want to access scanners. -%package libs-gphoto2 -Summary: SANE libraries for gphoto2 -Group: System Environment/Libraries +%package devel +Summary: SANE development toolkit +Group: Development/Libraries +Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libusb-devel +Requires: libieee1284-devel +Requires: libjpeg-devel +Requires: libtiff-devel +Requires: pkgconfig -%description libs-gphoto2 -This package contains the SANE libraries which are needed by applications that -want to access digital cameras. +%description devel +This package contains libraries and header files for writing Scanner Access Now +Easy (SANE) modules. + +%package drivers-scanners +Summary: SANE backend drivers for scanners +Group: System Environment/Libraries +Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: sane-backends < 1.0.22-4 +Conflicts: sane-backends < 1.0.22-4 + +%description drivers-scanners +This package contains backend drivers to access scanner hardware through SANE. + +%package drivers-cameras +Summary: Scanner backend drivers for digital cameras +Group: System Environment/Libraries +Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: sane-backends-libs-gphoto2 < 1.0.22-4 +Conflicts: sane-backends-libs-gphoto2 < 1.0.22-4 +Provides: sane-libs-gphoto2 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: sane-libs-gphoto2%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description drivers-cameras +This package contains backend drivers to access digital cameras through SANE. %prep %setup -q @@ -126,7 +141,6 @@ install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/ %find_lang %name - %clean rm -rf %{buildroot} @@ -147,20 +161,13 @@ rm -rf %{buildroot} %doc %{_docdir}/* %exclude %{_mandir}/man1/sane-config.1* - %{_mandir}/*/* +%dir %{_libdir}/sane + %files libs %defattr(-, root, root) %{_libdir}/libsane*.so.* -%dir %{_libdir}/sane -%{_libdir}/sane/*.so* - -%exclude %{_libdir}/sane/*gphoto2.so* - -%files libs-gphoto2 -%defattr(-, root, root) -%{_libdir}/sane/*gphoto2.so.* %files devel %defattr(-,root,root) @@ -170,7 +177,20 @@ rm -rf %{buildroot} %{_libdir}/libsane*.so %{_libdir}/pkgconfig/sane-backends.pc +%files drivers-scanners +%defattr(-, root, root) +%{_libdir}/sane/*.so* +%exclude %{_libdir}/sane/*gphoto2.so* + +%files drivers-cameras +%defattr(-, root, root) +%{_libdir}/sane/*gphoto2.so.* + %changelog +* Thu Sep 15 2011 Nils Philippsen - 1.0.22-4 +- allow installing the libraries without the drivers (#736310): split off + drivers into -drivers-scanners, rename -libs-gphoto2 to -drivers-cameras + * Tue May 10 2011 Nils Philippsen - 1.0.22-3 - fix detection/handling of USB devices in xerox_mfp (#702983)