- Make man pages identical on multilib installations.

This commit is contained in:
Tim Waugh 2004-10-10 08:31:55 +00:00
parent 5a4f7903d2
commit 3f4a4054df
2 changed files with 16 additions and 0 deletions

View File

@ -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' $^ >$@

View File

@ -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 <twaugh@redhat.com>
- Make man pages identical on multilib installations.
* Thu Oct 7 2004 Tim Waugh <twaugh@redhat.com> 1.0.14-5
- Build requires libjpeg-devel (bug #134964).