rpms/sane-backends/F-11 sane-backends-1.0.20-genesys-gl841-registers.patch, NONE, 1.1 sane-backends-1.0.20-lockdir.patch, NONE, 1.1 sane-backends-1.0.20-udev.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sane-backends-1.0.20-rpath.patch, 1.1, 1.2 sane-backends.spec, 1.127, 1.128 sources, 1.19, 1.20
Nils Philippsen
nphilipp at fedoraproject.org
Tue Dec 29 13:56:39 UTC 2009
Author: nphilipp
Update of /cvs/pkgs/rpms/sane-backends/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1991
Modified Files:
.cvsignore sane-backends-1.0.20-rpath.patch sane-backends.spec
sources
Added Files:
sane-backends-1.0.20-genesys-gl841-registers.patch
sane-backends-1.0.20-lockdir.patch
sane-backends-1.0.20-udev.patch
Log Message:
update to current F-12/Rawhide
sane-backends-1.0.20-genesys-gl841-registers.patch:
genesys_gl841.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE sane-backends-1.0.20-genesys-gl841-registers.patch ---
commit 4d9d166a3ae830c62bb7341efe886c99e614199a
Author: Nils Philippsen <nils at redhat.com>
Date: Tue Dec 29 11:43:24 2009 +0100
patch: genesys-gl841-registers
Squashed commit of the following:
commit 8bb82ba231bec01377e28a4f7f635dca61c34fbb
Author: Pierre Willenbrock <pierre at pirsoft.dnsalias.org>
Date: Wed Jun 3 00:16:16 2009 +0200
Always send registers before trying to acquire a line
(cherry picked from commit a0ea955e91837156d2112c0ffd12c8afebe86efa)
Signed-off-by: Nils Philippsen <nils at redhat.com>
Resolves: rhbz#527935
diff --git a/backend/genesys_gl841.c b/backend/genesys_gl841.c
index 2810865..c9facc4 100644
--- a/backend/genesys_gl841.c
+++ b/backend/genesys_gl841.c
@@ -4948,9 +4948,6 @@ gl841_offset_calibration (Genesys_Device * dev)
return status;
}
- RIE (gl841_bulk_write_register
- (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
-
used_res = dev->current_setup.xres;
num_pixels = dev->current_setup.pixels;
@@ -4999,6 +4996,9 @@ gl841_offset_calibration (Genesys_Device * dev)
do {
+ RIE (gl841_bulk_write_register
+ (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
+
for (j=0; j < channels; j++) {
off[j] = (offh[j]+offl[j])/2;
dev->frontend.offset[j] = off[j];
sane-backends-1.0.20-lockdir.patch:
Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE sane-backends-1.0.20-lockdir.patch ---
commit 1e12605eac293b12809ca2933622acc54515c237
Author: Nils Philippsen <nils at redhat.com>
Date: Mon Dec 28 17:00:25 2009 +0100
patch: lockdir
Squashed commit of the following:
commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb
Author: Nils Philippsen <nils at redhat.com>
Date: Mon Dec 28 16:58:36 2009 +0100
improve install-lockpath target
make robust against problems with setting group on sane lock dir
diff --git a/backend/Makefile.am b/backend/Makefile.am
index 5165423..3c22cd4 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -137,7 +137,8 @@ install-firmware-path:
done
install-lockpath:
- $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
+ $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \
+ $(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
uninstall-hook:
rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)
sane-backends-1.0.20-udev.patch:
sane-desc.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE sane-backends-1.0.20-udev.patch ---
commit 9ba88134bd6d296ccbcf253c6ade3e646dc286b9
Author: Nils Philippsen <nils at redhat.com>
Date: Thu Oct 22 17:05:30 2009 +0200
patch: udev
Squashed commit of the following:
commit a7541ac649bea3f352a249dfc569f3bc18b5a968
Author: Nils Philippsen <nils at redhat.com>
Date: Thu Oct 22 17:02:52 2009 +0200
don't set owner, group or mode
setting owner, group or mode may interfere with setting ACLs
commit e385558cf214d263af93147995f1f8b729d2dabe
Author: Nils Philippsen <nils at redhat.com>
Date: Thu Oct 22 14:19:53 2009 +0200
fix device file ownership and mode
commit fe874d6f9873598e8bcd9201508bc2c89365e821
Author: Nils Philippsen <nils at redhat.com>
Date: Thu Oct 22 11:16:16 2009 +0200
adapt generated udev rules for Fedora
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index c317700..2a410b2 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -56,9 +56,9 @@
#define COLOR_NEW "\"#F00000\""
#define COLOR_UNKNOWN "\"#000000\""
-#define DEVMODE "0664"
+#define DEVMODE "0644"
#define DEVOWNER "root"
-#define DEVGROUP "scanner"
+#define DEVGROUP "root"
#ifndef PATH_MAX
# define PATH_MAX 1024
@@ -3475,8 +3475,8 @@ print_udev (void)
}
}
printf ("\n");
- printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
- usbid->usb_vendor_id + 2, usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
+ printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
+ usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
usbid = usbid->next;
}
@@ -3488,7 +3488,7 @@ print_udev (void)
printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
printf ("# Generic: SCSI device type 6 indicates a scanner\n");
- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n");
printf ("# Some scanners advertise themselves as SCSI device type 3\n");
while (scsiid)
@@ -3521,8 +3521,8 @@ print_udev (void)
}
}
printf ("\n");
- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
- scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
+ scsiid->scsi_vendor_id, scsiid->scsi_product_id);
scsiid = scsiid->next;
}
printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore 16 Jun 2009 15:54:59 -0000 1.18
+++ .cvsignore 29 Dec 2009 13:56:39 -0000 1.19
@@ -1,2 +1,2 @@
sane-backends-1.0.20.tar.gz
-sane-backends-1.0.20-autoreconf.patch.bz2
+sane-backends-1.0.20-11-autoreconf.patch.bz2
sane-backends-1.0.20-rpath.patch:
acinclude.m4 | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
Index: sane-backends-1.0.20-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/sane-backends-1.0.20-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sane-backends-1.0.20-rpath.patch 16 Jun 2009 15:54:59 -0000 1.1
+++ sane-backends-1.0.20-rpath.patch 29 Dec 2009 13:56:39 -0000 1.2
@@ -1,11 +1,17 @@
-commit e0de6eaee11254667eb6abb6e2ccb7768bd2de4f
+commit fe1456e2431a3b8bd27aadc5bbc6998ebc8cd00c
Author: Nils Philippsen <nils at redhat.com>
-Date: Tue Jun 16 16:59:43 2009 +0200
+Date: Mon Aug 31 16:38:23 2009 +0200
patch: rpath
Squashed commit of the following:
+ commit c37206c9fa724e19f6929d8a77e5399ca6b87f1f
+ Author: Nils Philippsen <nils at redhat.com>
+ Date: Mon Aug 31 16:34:42 2009 +0200
+
+ fix --enable-rpath
+
commit be2982b2d1ae4d889b4cecec289336b4b03579aa
Author: Nils Philippsen <nils at redhat.com>
Date: Tue Jun 2 16:12:23 2009 +0200
@@ -15,10 +21,10 @@ Date: Tue Jun 16 16:59:43 2009 +0200
make using runtime library search path configurable
diff --git a/acinclude.m4 b/acinclude.m4
-index 6413b60..c6f5800 100644
+index 6413b60..b2bb065 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -383,19 +383,31 @@ dnl
+@@ -383,19 +383,29 @@ dnl
AC_DEFUN([SANE_LINKER_RPATH],
[dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !!
@@ -38,9 +44,7 @@ index 6413b60..c6f5800 100644
+ AC_MSG_CHECKING([whether runtime link path should be used])
+ AC_ARG_ENABLE([rpath],
+ [AS_HELP_STRING([--enable-rpath],
-+ [use runtime library search path @<:@default=yes@:>@])]
-+ [],
-+ [enable_readline=yes])
++ [use runtime library search path @<:@default=yes@:>@])])
+
+ LINKER_RPATH=
+ AS_IF([test "x$enable_rpath" != xno],
Index: sane-backends.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/sane-backends.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- sane-backends.spec 4 Aug 2009 11:45:36 -0000 1.127
+++ sane-backends.spec 29 Dec 2009 13:56:39 -0000 1.128
@@ -1,7 +1,21 @@
+# Use the following --with/--without <option> switches to control how the
+# package will be built:
+#
+# udev: ship rules for udev (default for Fedora >= 12, RHEL >= 6)
+# hal: ship rules for hal (default for Fedora < 12, RHEL < 6)
+
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%bcond_without udev
+%bcond_with hal
+%else
+%bcond_with udev
+%bcond_without hal
+%endif
+
Summary: Scanner access software
Name: sane-backends
Version: 1.0.20
-Release: 6%{?dist}
+Release: 11%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@@ -14,9 +28,12 @@ Patch0: sane-backends-1.0.20-rpath.patch
Patch1: sane-backends-1.0.20-pkgconfig.patch
Patch2: sane-backends-1.0.20-open-macro.patch
Patch3: sane-backends-1.0.20-hal.patch
-Patch4: sane-backends-1.0.20-man-utf8.patch
-Patch5: sane-backends-1.0.20-epson-expression800.patch
-Patch10: sane-backends-1.0.20-autoreconf.patch.bz2
+Patch4: sane-backends-1.0.20-udev.patch
+Patch5: sane-backends-1.0.20-man-utf8.patch
+Patch6: sane-backends-1.0.20-epson-expression800.patch
+Patch7: sane-backends-1.0.20-lockdir.patch
+Patch8: sane-backends-1.0.20-genesys-gl841-registers.patch
+Patch10: sane-backends-1.0.20-11-autoreconf.patch.bz2
URL: http://www.sane-project.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
BuildRequires: tetex-latex
@@ -24,10 +41,15 @@ BuildRequires: libusb-devel
BuildRequires: libieee1284-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
+BuildRequires: libv4l-devel
BuildRequires: gettext
BuildRequires: gphoto2-devel
-Requires: pam >= 0.78-2
+%if %{with udev}
+Requires: udev >= 143
+%endif
+%if %{with hal}
Requires: hal >= 0.4.0
+%endif
%description
Scanner Access Now Easy (SANE) is a universal scanner interface. The
@@ -80,15 +102,18 @@ want to access digital cameras.
%patch1 -p1 -b .pkgconfig
%patch2 -p1 -b .open-macro
%patch3 -p1 -b .hal
-%patch4 -p1 -b .man-utf8
-%patch5 -p1 -b .epson-expression800
+%patch4 -p1 -b .udev
+%patch5 -p1 -b .man-utf8
+%patch6 -p1 -b .epson-expression800
+%patch7 -p1 -b .lockdir
+%patch8 -p1 -b .genesys-gl841-registers
%patch10 -p1 -b .autoreconf
%build
%configure \
--with-gphoto2=%{_prefix} \
--with-docdir=%{_docdir}/%{name}-%{version} \
- --disable-rpath
+ --disable-locking --disable-rpath
make %{?_smp_mflags}
@@ -103,12 +128,19 @@ rm -f %{buildroot}%{_mandir}/man1/gamma4
rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a
rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la
+%if %{with udev}
+mkdir -p %{buildroot}/lib/udev/rules.d
+install -m 0644 tools/udev/libsane.rules %{buildroot}/lib/udev/rules.d/65-libsane.rules
+%endif
+
+%if %{with hal}
mkdir -p %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty
mkdir -p %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty
install -m 0644 tools/hal/libsane.fdi %{buildroot}/%{_datadir}/hal/fdi/information/20thirdparty/19-libsane.fdi
install -m 0644 tools/hal/libsane-policy.fdi %{buildroot}/%{_datadir}/hal/fdi/policy/20thirdparty/19-libsane.fdi
mkdir -p %{buildroot}/%{_libexecdir}
install -m 0755 %{SOURCE2} %{buildroot}/%{_libexecdir}/hal-usb-scanner-add
+%endif
%find_lang %name
@@ -124,9 +156,14 @@ rm -rf %{buildroot}
%dir /etc/sane.d
%dir /etc/sane.d/dll.d
%config(noreplace) /etc/sane.d/*.conf
+%if %{with udev}
+/lib/udev/rules.d/65-libsane.rules
+%endif
+%if %{with hal}
%{_datadir}/hal/fdi/information/20thirdparty/*.fdi
%{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
%{_libexecdir}/hal-usb-scanner-add
+%endif
%{_mandir}/*/*
%{_datadir}/pixmaps/sane.png
@@ -157,6 +194,27 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc
%changelog
+* Tue Dec 29 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-11
+- genesys_gl841: always send registers before trying to acquire a line
+ (#527935)
+
+* Mon Dec 28 2009 Nils Philippsen <nils at redhat.com>
+- build v4l backend (#550119)
+- don't use lockdir, fix make install
+
+* Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-10
+- don't set owner, group or mode as this may interfere with setting ACLs
+
+* Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-9
+- fix device file ownership and mode
+
+* Thu Oct 22 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-8
+- ship adapted udev rules from F-12 on (#512516)
+- don't require pam anymore
+
+* Fri Aug 31 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-7
+- fix --enable-rpath
+
* Mon Aug 03 2009 Nils Philippsen <nils at redhat.com> - 1.0.20-6
- remove ExcludeArch: s390 s390x
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sane-backends/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources 16 Jun 2009 15:54:59 -0000 1.19
+++ sources 29 Dec 2009 13:56:39 -0000 1.20
@@ -1,2 +1,2 @@
a0cfdfdebca2feb4f2ba5d3418b15a42 sane-backends-1.0.20.tar.gz
-cd71d7e8a2ea0c1a8d51901317f50d39 sane-backends-1.0.20-autoreconf.patch.bz2
+b33b94acbfae50d9b31abb688573c17c sane-backends-1.0.20-11-autoreconf.patch.bz2
More information about the scm-commits
mailing list