[mj: 1/2] Upgrade to new version

Göran Uddeborg goeran at fedoraproject.org
Mon Jul 7 16:51:39 UTC 2014


commit 875a25ee3e516b4d66b7e4fceff0e7063a864798
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Mon Jul 7 18:48:39 2014 +0200

    Upgrade to new version
    
    - Drop upstreamed patch

 .gitignore                    |    3 +--
 mj-1.13-format-security.patch |   31 -------------------------------
 mj.spec                       |    9 +++++----
 sources                       |    2 +-
 4 files changed, 7 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ec6aa4..f36b233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/mj-GPL-1.12-src.tar.bz2
-/mj-GPL-1.13-src.tar.bz2
+/mj-GPL-1.14-src.tar.bz2
diff --git a/mj.spec b/mj.spec
index b803cc1..e478ca0 100644
--- a/mj.spec
+++ b/mj.spec
@@ -1,5 +1,5 @@
 Name:        mj
-Version:     1.13
+Version:     1.14
 Release:     1
 Summary:     Mah-Jong program with network option
 Summary(sv): Mah-Jong-program med nätmöjlighet
@@ -17,8 +17,6 @@ Source0:     %name-GPL-%version-src.tar.bz2
 # and run the command:
 # ./remove-non-GPL.sh %version
 Source1:     remove-non-GPL.sh
-# Submittet upstreams via email.
-Patch:	     mj-1.13-format-security.patch
 
 BuildRequires: perl
 BuildRequires: gtk2-devel
@@ -54,7 +52,6 @@ kombination av de två.
 
 %prep
 %setup -q -n %name-%version-src
-%patch
 # Convert the kdegames tiles to the format of the bundled ones.
 mkdir tiles-kdegames
 cd tiles-kdegames
@@ -133,6 +130,10 @@ gtk-update-icon-cache %icontop &>/dev/null || :
 
 
 %changelog
+* Mon Jul 07 2014 Göran Uddeborg <goeran at uddeborg.se> - 1.14-1
+- Upgrade to new version
+- Drop upstreamed patch
+
 * Tue Dec  3 2013 Göran Uddeborg <goeran at uddeborg.se> 1.13-1
 - Upgraded to new upstream 1.13. Bz #1021370
 - Fixed printf format security issue.  Bz #1037202.
diff --git a/sources b/sources
index fb2ff53..101399e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f1af411f6521d53cb31101be4246b03  mj-GPL-1.13-src.tar.bz2
+5e19cd624dca6203579fd769e47e7807  mj-GPL-1.14-src.tar.bz2


More information about the scm-commits mailing list