Andreas Stieger
491fc02a9e
Apache Subversion 1.8.0 OBS-URL: https://build.opensuse.org/request/show/179562 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=127
87 lines
4.7 KiB
Diff
87 lines
4.7 KiB
Diff
From: Andreas Stieger <andreas.stieger@gmx.de>
|
|
Date: Wed, 06 Mar 2013 00:05:08 +0000
|
|
Subject: Remove volatile build information
|
|
Upstream: never
|
|
|
|
Prevent unneccessary rebuilds of binary packages differing only by date, time and build host.
|
|
|
|
---
|
|
subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java | 4 ++--
|
|
subversion/libsvn_subr/opt.c | 8 ++------
|
|
subversion/libsvn_subr/version.c | 4 ++--
|
|
subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout | 1 -
|
|
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout | 1 -
|
|
5 files changed, 6 insertions(+), 12 deletions(-)
|
|
|
|
Index: subversion-nightly/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
|
|
===================================================================
|
|
--- subversion-nightly.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2013-04-01 20:57:02.000000000 +0100
|
|
+++ subversion-nightly/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2013-04-11 23:50:53.000000000 +0100
|
|
@@ -140,10 +140,10 @@ public class BasicTests extends SVNTests
|
|
{
|
|
VersionExtended vx = client.getVersionExtended(false);
|
|
String result = vx.getBuildDate();
|
|
- if (result == null || result.trim().length() == 0)
|
|
+ if (result == null)
|
|
throw new Exception("Build date empty");
|
|
result = vx.getBuildTime();
|
|
- if (result == null || result.trim().length() == 0)
|
|
+ if (result == null)
|
|
throw new Exception("Build time empty");
|
|
result = vx.getBuildHost();
|
|
if (result == null || result.trim().length() == 0)
|
|
Index: subversion-nightly/subversion/libsvn_subr/opt.c
|
|
===================================================================
|
|
--- subversion-nightly.orig/subversion/libsvn_subr/opt.c 2013-03-23 14:35:40.000000000 +0000
|
|
+++ subversion-nightly/subversion/libsvn_subr/opt.c 2013-04-11 23:51:47.000000000 +0100
|
|
@@ -1114,12 +1114,8 @@ svn_opt__print_version_info(const char *
|
|
if (quiet)
|
|
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
|
|
|
|
- SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n"
|
|
- " compiled %s, %s on %s\n\n"),
|
|
- pgm_name, SVN_VERSION,
|
|
- svn_version_ext_build_date(info),
|
|
- svn_version_ext_build_time(info),
|
|
- svn_version_ext_build_host(info)));
|
|
+ SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"),
|
|
+ pgm_name, SVN_VERSION));
|
|
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
|
|
|
|
if (footer)
|
|
Index: subversion-nightly/subversion/libsvn_subr/version.c
|
|
===================================================================
|
|
--- subversion-nightly.orig/subversion/libsvn_subr/version.c 2013-03-22 15:59:11.000000000 +0000
|
|
+++ subversion-nightly/subversion/libsvn_subr/version.c 2013-04-11 23:50:53.000000000 +0100
|
|
@@ -125,8 +125,8 @@ svn_version_extended(svn_boolean_t verbo
|
|
{
|
|
svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
|
|
|
|
- info->build_date = __DATE__;
|
|
- info->build_time = __TIME__;
|
|
+ info->build_date = "";
|
|
+ info->build_time = "";
|
|
info->build_host = SVN_BUILD_HOST;
|
|
info->copyright = apr_pstrdup
|
|
(pool, _("Copyright (C) 2013 The Apache Software Foundation.\n"
|
|
Index: subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
|
|
===================================================================
|
|
--- subversion-nightly.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2012-09-10 22:58:53.000000000 +0100
|
|
+++ subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2013-04-11 23:51:25.000000000 +0100
|
|
@@ -1,5 +1,4 @@
|
|
svn, version 1.8.0-dev (under development)
|
|
- compiled Sep 10 2012, 14:00:24 on i386-apple-darwin11.4.0
|
|
|
|
Copyright (C) 2012 The Apache Software Foundation.
|
|
This software consists of contributions made by many people;
|
|
Index: subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
|
|
===================================================================
|
|
--- subversion-nightly.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2012-09-10 13:03:34.000000000 +0100
|
|
+++ subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2013-04-11 23:51:33.000000000 +0100
|
|
@@ -1,5 +1,4 @@
|
|
svn, version 0.16.0 (r3987)
|
|
- compiled Dec 5 2002, 00:02:51
|
|
|
|
Copyright (C) 2010 The Apache Software Foundation.
|
|
This software consists of contributions made by many people;
|