ignatenkobrain pushed to meson (f22). "Update to latest git (..more)"

[notifications at fedoraproject.org]

From e2b9f4a649b4c9d1b03c014f01fc50b341d6646a Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Thu, 21 May 2015 13:04:13 +0300
Subject: Update to latest git

Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>

diff --git a/.gitignore b/.gitignore
index beea1ee..3d62b76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /meson-18550fe.tar.gz
 /meson-3b49b71.tar.gz
 /meson-0.23.0.tar.gz
+/meson-0ba1d54.tar.gz
diff --git a/0001-Accept-.S-files-as-assembler-too.patch b/0001-Accept-.S-files-as-assembler-too.patch
deleted file mode 100644
index d8d4fb1..0000000
--- a/0001-Accept-.S-files-as-assembler-too.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0ba1d545afe021e09090f434d5242ae942e7d5b4 Mon Sep 17 00:00:00 2001
-From: Jussi Pakkanen <jpakkane at gmail.com>
-Date: Wed, 20 May 2015 22:32:55 +0300
-Subject: [PATCH] Accept .S files as assembler too.
-
----
- compilers.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/compilers.py b/compilers.py
-index 6fe7370..5e66b23 100644
---- a/compilers.py
-+++ b/compilers.py
-@@ -1043,7 +1043,7 @@ class GnuCCompiler(CCompiler):
-         return get_gcc_soname_args(self.gcc_type, shlib_name, path, soversion)
- 
-     def can_compile(self, filename):
--        return super().can_compile(filename) or filename.split('.')[-1] == 's' # Gcc can do asm, too.
-+        return super().can_compile(filename) or filename.split('.')[-1].lower() == 's' # Gcc can do asm, too.
- 
- class GnuObjCCompiler(ObjCCompiler):
-     std_warn_args = ['-Wall', '-Wpedantic', '-Winvalid-pch']
-@@ -1120,7 +1120,7 @@ class ClangCCompiler(CCompiler):
-         return 'pch'
- 
-     def can_compile(self, filename):
--        return super().can_compile(filename) or filename.split('.')[-1] == 's' # Clang can do asm, too.
-+        return super().can_compile(filename) or filename.split('.')[-1].lower() == 's' # Clang can do asm, too.
- 
-     def get_pch_use_args(self, pch_dir, header):
-         # Workaround for Clang bug http://llvm.org/bugs/show_bug.cgi?id=15136
--- 
-2.4.1
-
diff --git a/meson.spec b/meson.spec
index 4885a1a..9110eb0 100644
--- a/meson.spec
+++ b/meson.spec
@@ -1,15 +1,18 @@
 %global __python %{__python3}
 
+%global commit 0ba1d54
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global date 20150521
+
 Name:           meson
 Version:        0.23.0
-Release:        3%{?dist}
+Release:        3.%{date}git%{shortcommit}%{?dist}
 Summary:        High productivity build system
 
 License:        ASL 2.0
 URL:            https://jpakkane.github.io/meson/
-Source0:        https://github.com/jpakkane/meson/archive/%{version}/%{name}-%{version}.tar.gz
-# https://github.com/jpakkane/meson/commit/0ba1d545afe021e09090f434d5242ae942e7d5b4
-Patch0:         0001-Accept-.S-files-as-assembler-too.patch
+#Source0:        https://github.com/jpakkane/meson/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/jpakkane/meson/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  python3-devel ninja-build
@@ -88,6 +91,9 @@ chmod +x %{buildroot}%{_bindir}/meson*
 %{_mandir}/man1/%{name}gui.1.*
 
 %changelog
+* Thu May 21 2015 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.23.0-3.20150328git0ba1d54
+- Update to latest git
+
 * Thu May 21 2015 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.23.0-3
 - Add patch to accept .S files
 
diff --git a/sources b/sources
index 7ec9956..7189c2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cd49a8112191ce0a3c1e7a035df7fd9  meson-0.23.0.tar.gz
+57fb414640ad3679d516f9eda0cdf34d  meson-0ba1d54.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/meson.git/commit/?h=f22&id=e2b9f4a649b4c9d1b03c014f01fc50b341d6646a