diff --git a/sane-backends-multilib.patch b/sane-backends-multilib.patch new file mode 100644 index 0000000..98c2677 --- /dev/null +++ b/sane-backends-multilib.patch @@ -0,0 +1,11 @@ +--- sane-backends-1.0.14/doc/Makefile.in.multilib 2004-10-10 09:29:29.277170282 +0100 ++++ sane-backends-1.0.14/doc/Makefile.in 2004-10-10 09:30:33.036979143 +0100 +@@ -111,7 +111,7 @@ + @sed -e 's|@DATADIR@|$(datadir)|g' \ + -e 's|@CONFIGDIR@|$(configdir)|g' \ + -e 's|@DOCDIR@|$(docdir)|g' \ +- -e 's|@LIBDIR@|$(libdir)/sane|g' \ ++ -e 's|@LIBDIR@|/usr/lib*/sane|g' \ + -e 's|@BINDIR@|$(bindir)|g' \ + -e 's|@SBINDIR@|$(sbindir)|g' \ + -e 's|@PACKAGEVERSION@|$(package_version)|g' $^ >$@ diff --git a/sane-backends.spec b/sane-backends.spec index f0a0ac9..e1a1c70 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -12,6 +12,7 @@ Patch1: sane-backends-1.0.11-rpath.patch Patch2: sane-backends-1.0.11-docdir.patch Patch3: sane-backends-1.0.12-badcode.patch Patch4: sane-backends-1.0.12-no_rpath.patch +Patch5: sane-backends-multilib.patch Patch6: sane-backends-ep2400.patch URL: http://www.sane-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -63,6 +64,7 @@ included in the sane-backends package. %patch2 -p1 -b .docdir %patch3 -p1 -b .badcode %patch4 -p1 -b .no_rpath +%patch5 -p1 -b .multilib %patch6 -p1 -b .ep2400 # Fix bug #62847. @@ -133,6 +135,9 @@ rm -rf %{buildroot} %{_libdir}/sane/*.so %changelog +* Sun Oct 10 2004 Tim Waugh +- Make man pages identical on multilib installations. + * Thu Oct 7 2004 Tim Waugh 1.0.14-5 - Build requires libjpeg-devel (bug #134964).