Merge branch 'v130' into 'master'

[packaging] Upgrade to 1.3.0. Fixes JB#37195

Updated to patches to git formatted patches. You can now use
git am to apply patches locally.

See merge request !1

rpm/0001-yasm-No-build-date.patch

@@ -0,0 +1,25 @@
+From d79030ee7e41ca91f1446f149d1bb6300d020e9d Mon Sep 17 00:00:00 2001
+From: Raine Makelainen <raine.makelainen@jolla.com>
+Date: Tue, 13 Dec 2016 12:11:30 +0200
+Subject: [PATCH 1/2] yasm: No build date
+
+Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
+---
+ frontends/tasm/tasm.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/frontends/tasm/tasm.c b/frontends/tasm/tasm.c
+index 58954b6..568f478 100644
+--- a/frontends/tasm/tasm.c
++++ b/frontends/tasm/tasm.c
+@@ -228,7 +228,6 @@ static opt_option options[] =
+ /* version message */
+ /*@observer@*/ static const char *version_msg[] = {
+     PACKAGE_STRING,
+-    "Compiled on " __DATE__ ".",
+     "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.",
+     "Run yasm --license for licensing overview and summary."
+ };
+-- 
+2.7.4
+

rpm/0002-yasm-No-RPM-opt-flags.patch

@@ -0,0 +1,24 @@
+From 176a6956b0b40f56a311a8247794ce602138150b Mon Sep 17 00:00:00 2001
+From: Raine Makelainen <raine.makelainen@jolla.com>
+Date: Tue, 13 Dec 2016 12:12:10 +0200
+Subject: [PATCH 2/2] yasm: No RPM opt flags
+
+Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b1524aa..1a837dc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -233,5 +233,5 @@ genstring_LDADD = genstring.$(OBJEXT)
+ genstring_LINK = $(CCLD_FOR_BUILD) -o $@
+
+ genstring.$(OBJEXT): genstring.c
+-	$(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f genstring.c || echo '$(srcdir)/'`genstring.c
++	$(CC_FOR_BUILD) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f genstring.c || echo '$(srcdir)/'`genstring.c
+
+-- 
+2.7.4
+

rpm/yasm.spec

@@ -18,14 +18,14 @@
 
 Name:           yasm
 Summary:        A complete rewrite of the NASM assembler
-License:        Artistic-1.0 and BSD-2-Clause and BSD-3-Clause and GPL-2.0+ and LGPL-2.0+
+License:        (Artistic-1.0 or GPLv2+ or LGPLv2+) and BSD and GPLv2+ and LGPLv2+
 Group:          Development/Languages/Other
-Version:        1.2.0
+Version:        1.3.0
 Release:        0
-Url:            http://www.tortall.net/projects/yasm/
+Url:            http://www.tortall.net/projects/yasm/releases
 Source:         %{name}-%{version}.tar.gz
-Patch0:         %{name}-no-build-date.patch
-Patch1:         %{name}-no-rpm-opt-flags.patch
+Patch0:         0001-%{name}-No-build-date.patch
+Patch1:         0002-%{name}-No-RPM-opt-flags.patch
 BuildRequires:  python
 ExclusiveArch:  i586 i486 i386 x86_64
 
@@ -47,7 +47,7 @@ libyasm.
 
 %prep
 %setup -q -n %{name}-%{version}/%{name}
-%patch0
+%patch0 -p1
 %patch1 -p1
 
 %build
@@ -60,10 +60,6 @@ make %{?jobs:-j%jobs}
 %install
 %makeinstall
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root)
 %doc Artistic.txt BSD.txt COPYING GNU_GPL-2.0 GNU_LGPL-2.0