- libs shouldn't depends on base package. Properly fix #736310

- base package should obsolete -docs as it provides them not -libs
- update spec to current standard
This commit is contained in:
Peter Robinson 2011-11-28 20:36:35 +00:00
parent f682490b25
commit ac31964e0a

View File

@ -8,7 +8,7 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.0.22 Version: 1.0.22
Release: 6%{?dist} Release: 7%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain # Tools are GPLv2+, docs are public domain
# see LICENSE for details # see LICENSE for details
@ -37,7 +37,7 @@ Patch8: sane-backends-1.0.22-epson-stylus-sx125.patch
# submitted upstream: c648a4411e5eacf19da2de726dac06ec07dae302 # submitted upstream: c648a4411e5eacf19da2de726dac06ec07dae302
Patch9: sane-backends-1.0.22-av220-gray-modes.patch Patch9: sane-backends-1.0.22-av220-gray-modes.patch
URL: http://www.sane-project.org URL: http://www.sane-project.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
BuildRequires: tetex-latex BuildRequires: tetex-latex
BuildRequires: libusb-devel BuildRequires: libusb-devel
BuildRequires: libieee1284-devel BuildRequires: libieee1284-devel
@ -50,6 +50,8 @@ Requires: udev >= 143
Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sane-backends-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: sane-backends < 1.0.22-4 Obsoletes: sane-backends < 1.0.22-4
Conflicts: sane-backends < 1.0.22-4 Conflicts: sane-backends < 1.0.22-4
Obsoletes: sane-backends-docs <= 1.0.17-12
Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release}
%description %description
Scanner Access Now Easy (SANE) is a universal scanner interface. The Scanner Access Now Easy (SANE) is a universal scanner interface. The
@ -60,10 +62,6 @@ hand-held scanner, video and still cameras, frame-grabbers, etc.).
%package libs %package libs
Summary: SANE libraries Summary: SANE libraries
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: sane-backends = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: sane-backends <= 1.0.17-12
Obsoletes: sane-backends-docs <= 1.0.17-12
Provides: sane-backends-docs = %{?epoch:%{epoch}:}%{version}-%{release}
%description libs %description libs
This package contains the SANE libraries which are needed by applications that This package contains the SANE libraries which are needed by applications that
@ -142,7 +140,6 @@ make %{?_smp_mflags}
%install %install
rm -rf %{buildroot}
make DESTDIR="%{buildroot}" install make DESTDIR="%{buildroot}" install
mkdir -p %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/pixmaps
@ -160,9 +157,6 @@ install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/
%find_lang %name %find_lang %name
%clean
rm -rf %{buildroot}
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
@ -206,6 +200,11 @@ rm -rf %{buildroot}
%{_libdir}/sane/*gphoto2.so.* %{_libdir}/sane/*gphoto2.so.*
%changelog %changelog
* Mon Nov 28 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.0.22-7
- libs shouldn't depends on base package. Properly fix #736310
- base package should obsolete -docs as it provides them not -libs
- update spec to current standard
* Fri Nov 18 2011 Nils Philippsen <nils@redhat.com> - 1.0.22-6 * Fri Nov 18 2011 Nils Philippsen <nils@redhat.com> - 1.0.22-6
- avision: reenable grayscale and lineart modes for AV220 (#700725) - avision: reenable grayscale and lineart modes for AV220 (#700725)