rpm/sane-backends
SHA256
1
0
Fork 0
forked from pool/sane-backends
Code Pull Requests Activity

Accepting request 353171 from graphics

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/353171
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=81
This commit is contained in:
Dominique Leuenberger 2016-01-13 21:44:24 +00:00 committed by Git OBS Bridge
commit 072539f832
3 changed files with 91 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
sane-backends.builttime.patch Normal file
View File

@ -0,0 +1,76 @@
---
tools/sane-desc.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Index: sane-backends-1.0.25/tools/sane-desc.c
===================================================================
--- sane-backends-1.0.25.orig/tools/sane-desc.c
+++ sane-backends-1.0.25/tools/sane-desc.c
@@ -2816,8 +2816,8 @@ html_print_footer (void)
"<address>\n"
"<a href=\"http://www.sane-project.org/imprint.html\"\n"
">Contact</a>\n" "</address>\n" "<font size=-1>\n");
- printf ("This page was last updated on %s by sane-desc %s from %s\n",
- asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING);
+ printf ("This page was last updated by sane-desc %s from %s\n",
+ SANE_DESC_VERSION, PACKAGE_STRING);
printf ("</font>\n");
printf ("</body> </html>\n");
}
@@ -3326,10 +3326,10 @@ print_usermap_header (void)
printf
("# This file was automatically created based on description files (*.desc)\n"
- "# by sane-desc %s from %s on %s"
+ "# by sane-desc %s from %s"
"#\n"
,
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
+ SANE_DESC_VERSION, PACKAGE_STRING);
printf
("# The entries below are used to detect a USB device and change owner\n"
@@ -3398,8 +3398,8 @@ print_db_header (void)
{
time_t current_time = time (0);
printf ("# This file was automatically created based on description files (*.desc)\n"
- "# by sane-desc %s from %s on %s",
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
+ "# by sane-desc %s from %s",
+ SANE_DESC_VERSION, PACKAGE_STRING);
printf
("#\n"
"# The entries below are used to detect a USB device when it's plugged in\n"
@@ -3463,8 +3463,8 @@ print_udev_header (void)
{
time_t current_time = time (0);
printf ("# This file was automatically created based on description files (*.desc)\n"
- "# by sane-desc %s from %s on %s",
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
+ "# by sane-desc %s from %s",
+ SANE_DESC_VERSION, PACKAGE_STRING);
printf
("#\n"
@@ -3656,8 +3656,8 @@ print_udevhwdb_header (void)
{
time_t current_time = time (0);
printf ("# This file was automatically created based on description files (*.desc)\n"
- "# by sane-desc %s from %s on %s",
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
+ "# by sane-desc %s from %s",
+ SANE_DESC_VERSION, PACKAGE_STRING);
printf
("#\n"
@@ -3766,8 +3766,8 @@ print_hwdb_header (void)
{
time_t current_time = time (0);
printf ("# This file was automatically created based on description files (*.desc)\n"
- "# by sane-desc %s from %s on %s",
- SANE_DESC_VERSION, PACKAGE_STRING, asctime (localtime (&current_time)));
+ "# by sane-desc %s from %s",
+ SANE_DESC_VERSION, PACKAGE_STRING);
printf
("#\n"

11
sane-backends.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Jan 11 11:44:28 UTC 2016 - olaf@aepfle.de
- sane-backends.builttime.patch: reduce build-compare noise
-------------------------------------------------------------------
Tue Dec 29 22:32:37 UTC 2015 - stefan.bruens@rwth-aachen.de
- remove gphoto2 backend, as is usefulness is highly questionable,
but adds many (indirect) build and runtime dependencies
-------------------------------------------------------------------
Tue Oct 6 10:55:10 CEST 2015 - jsmeix@suse.de

7
sane-backends.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package sane-backends
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,6 @@
Name: sane-backends
BuildRequires: libgphoto2-devel
%if 0%{?suse_version} > 1130
BuildRequires: libieee1284-devel
%else
@ -73,6 +72,8 @@ Source201: create_sane-backends-autoconfig.rules
# GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1):
# see https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366
Patch1: dell1600n_net-fix-strncat.patch
# Patch2 sane-backends.builttime.patch avoids build-compare noise
Patch2: sane-backends.builttime.patch
# Patch100... is SUSE specific stuff:
# Patch101 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am
# because it is intentionally removed from the sources in the prep section:
@ -168,6 +169,7 @@ package or remove it when it is already installed.
# GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1)
# see https://alioth.debian.org/tracker/index.php?func=detail&aid=315198&group_id=30186&atid=410366
%patch1
%patch2 -p1
# Patch100... is SUSE specific stuff:
# Patch101 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am
# because it is intentionally removed from the sources in the prep section:
@ -223,7 +225,6 @@ export LDFLAGS="-L/%_lib $LDFLAGS"
--sbindir=%{_sbindir} \
--mandir=%{_mandir} \
--datadir=%{_datadir} \
--with-gphoto2 \
--with-docdir=%{_defaultdocdir}/sane-backends \
--enable-pthread \
--enable-libusb_1_0 \