[libreoffice/f19] never run autogen.sh

David Tardon dtardon at fedoraproject.org
Fri Mar 7 13:14:51 UTC 2014


commit e504f9810faf243b1e0225406ecab4e598c61040
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 20 19:45:23 2014 +0100

    never run autogen.sh
    
    (cherry picked from commit 8dd1ed86ec5e888b4913d2e224a94ac0ed19deae)
    
    Conflicts:
    	libreoffice.spec

 0001-never-run-autogen.sh.patch |   25 +++++++++++++++++++++++++
 libreoffice.spec                |    1 +
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/0001-never-run-autogen.sh.patch b/0001-never-run-autogen.sh.patch
new file mode 100644
index 0000000..3adc728
--- /dev/null
+++ b/0001-never-run-autogen.sh.patch
@@ -0,0 +1,25 @@
+From 820efe20886e41fdea8353f54e8a54bba7fccd84 Mon Sep 17 00:00:00 2001
+From: rpmbuild <rpmbuild at fedoraproject.org>
+Date: Thu, 20 Feb 2014 19:44:49 +0100
+Subject: [PATCH] never run autogen.sh
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 206f5ed..14620da 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14,7 +14,7 @@ MAKECMDGOALS?=all
+ SHELL=/usr/bin/env bash
+ SRCDIR := @SRC_ROOT@
+ BUILDDIR := @BUILDDIR@
+-GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T)
++GIT_BUILD :=
+ 
+ # Run autogen.sh if needed and force make to restart itself.
+ # ... but there are several cases where we do not want to run
+-- 
+1.8.5.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index da2a05b..8bf6f39 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -276,6 +276,7 @@ Patch35: 0001-KDE-don-t-throw-on-TemplatePathVariable.patch
 Patch36: 0001-Resolves-rhbz-1007697-Update-on-a-Window-triggering-.patch
 Patch37: 0001-Wizards-should-look-for-templates-in-Template_intern.patch
 Patch38: 0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
+Patch39: 0001-never-run-autogen.sh.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice


More information about the scm-commits mailing list