1
0
forked from pool/sane-backends

Accepting request 39007 from home:jsmeix:branches:graphics

Copy from home:jsmeix:branches:graphics/sane-backends via accept of submit request 39007 revision 2.
Request was accepted with message:

Re-added /usr/lib[64]/libsane.so

OBS-URL: https://build.opensuse.org/request/show/39007
OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=21
This commit is contained in:
Johannes Meixner 2010-04-28 13:42:06 +00:00 committed by Git OBS Bridge
parent bb433511ac
commit fb658fbcb5
2 changed files with 7 additions and 10 deletions

View File

@ -5,10 +5,7 @@ Wed Apr 28 11:27:50 CEST 2010 - jsmeix@suse.de
device access permissions for scanners to the currently logged device access permissions for scanners to the currently logged
in "desktop" user. Therefore all HAL related stuff was removed in "desktop" user. Therefore all HAL related stuff was removed
(see Novell/Suse Bugzilla bnc#593946). (see Novell/Suse Bugzilla bnc#593946).
- Removed /usr/lib[64]/libsane.so and /usr/lib[64]/libsane.la - Removed /usr/lib[64]/libsane.la
which are not needed by scanning frontends which are provided
by openSUSE because /usr/bin/scanimage, /usr/bin/xsane,
and /usr/bin/skanlite link with /usr/libi[64]/libsane.so.1
(see Novell/Suse Bugzilla bnc#592143). (see Novell/Suse Bugzilla bnc#592143).
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -399,13 +399,13 @@ make install DESTDIR=%{buildroot}
rm %{buildroot}%{_libdir}/sane/libsane-*.so rm %{buildroot}%{_libdir}/sane/libsane-*.so
rm %{buildroot}%{_libdir}/sane/libsane-*.la rm %{buildroot}%{_libdir}/sane/libsane-*.la
# Because of https://bugzilla.novell.com/show_bug.cgi?id=592143 for openSUSE 11.3 # Because of https://bugzilla.novell.com/show_bug.cgi?id=592143 for openSUSE 11.3
# even those files for the dll meta-backend /usr/lib/libsane.so and /usr/lib/libsane.la # even the /usr/lib/libsane.la file for the dll meta-backend is removed
# are removed regardless that it is unknown how whatever third-party scanning frontend # regardless that it is unknown how whatever third-party scanning frontend
# may like to link with SANE (i.e. with the dll meta-backend). # may like to link with SANE (i.e. with the dll meta-backend).
# At least the frontends which are provided by openSUSE /usr/bin/scanimage, /usr/bin/xsane, # The frontends which are provided by openSUSE /usr/bin/scanimage,
# and /usr/bin/skanlite link with /usr/lib/libsane.so.1 so that those frontends # /usr/bin/xsane, and /usr/bin/skanlite do not need it.
# neither need /usr/lib/libsane.so nor /usr/lib/libsane.la: # The /usr/lib/libsane.so link for the dll meta-backend is kept because it is needed
rm %{buildroot}%{_libdir}/libsane.so # during build-time by other packages which need sane-backends to build.
rm %{buildroot}%{_libdir}/libsane.la rm %{buildroot}%{_libdir}/libsane.la
# Disable all backends in /etc/sane.d/dll.conf to avoid problems when backends are active by default: # Disable all backends in /etc/sane.d/dll.conf to avoid problems when backends are active by default:
perl -pi -e 's/^([^#].*)$/#$1/' %{buildroot}%{_sysconfdir}/sane.d/dll.conf perl -pi -e 's/^([^#].*)$/#$1/' %{buildroot}%{_sysconfdir}/sane.d/dll.conf