From 215d1da823da530b8b1bd58e94b6a1b9d8383ce57dec0b744e53a7a581f23548 Mon Sep 17 00:00:00 2001
From: Michal Srb <michalsrb@please-enter-an-email-address>
Date: Fri, 30 May 2014 12:45:02 +0000
Subject: [PATCH] Accepting request 235723 from home:elvigia:branches:X11:XOrg

- n_tigervnc-date-time.patch package republishes everyday
 and gets on my nerves, this is because the binaries contain
 hardcoded timestamps, avoid that.
- export CXXFLAGS and CFLAGS before building ttigervnc otherwise
  it gets built without optimization.
- Make build verbose so it rpmlint catches errors like the above ones.

OBS-URL: https://build.opensuse.org/request/show/235723
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=30
---
 n_tigervnc-date-time.patch | 40 ++++++++++++++++++++++++++++++++++++++
 tigervnc.changes           | 11 +++++++++++
 tigervnc.spec              | 10 ++++++----
 3 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 n_tigervnc-date-time.patch

diff --git a/n_tigervnc-date-time.patch b/n_tigervnc-date-time.patch
new file mode 100644
index 0000000..088420a
--- /dev/null
+++ b/n_tigervnc-date-time.patch
@@ -0,0 +1,40 @@
+--- tigervnc-1.3.1.orig/unix/xserver/hw/vnc/buildtime.c
++++ tigervnc-1.3.1/unix/xserver/hw/vnc/buildtime.c
+@@ -15,4 +15,4 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+  * USA.
+  */
+-char buildtime[] = __DATE__ " " __TIME__;
++char buildtime[] = "??? ?? ???? ??:??:??";
+--- tigervnc-1.3.1.orig/unix/vncconfig/buildtime.c
++++ tigervnc-1.3.1/unix/vncconfig/buildtime.c
+@@ -15,4 +15,4 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+  * USA.
+  */
+-char buildtime[] = __DATE__ " " __TIME__;
++char buildtime[] = "??? ?? ???? ??:??:??";
+--- tigervnc-1.3.1.orig/unix/x0vncserver/buildtime.c
++++ tigervnc-1.3.1/unix/x0vncserver/buildtime.c
+@@ -15,4 +15,4 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+  * USA.
+  */
+-char buildtime[] = __DATE__ " " __TIME__;
++char buildtime[] = "??? ?? ???? ??:??:??";
+--- tigervnc-1.3.1.orig/vncviewer/buildTime.cxx
++++ tigervnc-1.3.1/vncviewer/buildTime.cxx
+@@ -15,4 +15,4 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+  * USA.
+  */
+-const char* buildTime = "Built on " __DATE__ " at " __TIME__;
++const char* buildTime = "Built on ??? ?? ???? at ??:??:??";
+--- tigervnc-1.3.1.orig/win/winvnc/buildTime.cxx
++++ tigervnc-1.3.1/win/winvnc/buildTime.cxx
+@@ -15,4 +15,4 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+  * USA.
+  */
+-const char* buildTime = "Built on " __DATE__ " at " __TIME__;
++const char* buildTime = "Built on ??? ?? ???? at ??:??:??";
diff --git a/tigervnc.changes b/tigervnc.changes
index 97b8c4b..5a185bd 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu May 29 03:37:30 UTC 2014 - crrodriguez@opensuse.org
+
+- n_tigervnc-date-time.patch package republishes everyday
+ and gets on my nerves, this is because the binaries contain
+ hardcoded timestamps, avoid that.
+- export CXXFLAGS and CFLAGS before building ttigervnc otherwise
+  it gets built without optimization.
+- Make build verbose so it rpmlint catches errors like the above ones.
+
+
 -------------------------------------------------------------------
 Wed May 28 14:54:02 UTC 2014 - msrb@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index a53fefd..b793230 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -107,7 +107,7 @@ Patch4:         tigervnc-sf3492352.diff
 Patch5:         tigervnc-sf3495623.patch
 Patch6:         u_tigervnc-dont-send-ascii-control-characters.patch
 Patch7:         u_tigervnc-ignore-epipe-on-write.patch
-
+Patch8:         n_tigervnc-date-time.patch
 # Xserver patches
 Patch10:        tigervnc-1.2.80-fix-int-to-pointer.patch
 Patch11:        u_aarch64-support.patch
@@ -147,7 +147,7 @@ fi
 %patch5 -p1
 %patch6 -p0
 %patch7 -p0
-
+%patch8 -p1
 pushd unix/xserver
 patch -p1 < ../xserver114.patch
 %patch10 -p1
@@ -158,8 +158,10 @@ patch -p1 < ../xserver114.patch
 popd
 
 %build
+export CXXFLAGS="%optflags"
+export CFLAGS="%optflags"
 # Build all tigervnc
-cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo
+cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo
 make %{?_smp_mflags}
 
 # Build Xvnc server
@@ -180,7 +182,7 @@ autoreconf -fi
         --disable-devel-docs \
         --with-fontrootdir=/usr/share/fonts \
         --disable-selective-werror
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 popd
 
 # Build java client