Imported Upstream version 1.12.20

Change-Id: Ide15b25939cbf093687a4e57b81a41ec35364523
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 583d317..9b120c4 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "12")
-SET(VERSION_PATCH "19")
+SET(VERSION_PATCH "20")
 
-# LAST RELEASED: 1.12.19
+# LAST RELEASED: 1.12.20
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index 4f1e361..236f327 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,9 +1,18 @@
 -------------------------------------------------------------------
+Wed Oct  7 13:09:48 CEST 2015 - ma@suse.de
+
+- fix suse_version test (bsc#949046)
+- version 1.12.20
+
+-------------------------------------------------------------------
 Wed Oct  7 11:46:11 CEST 2015 - ma@suse.de
 
 - Show locked packages in summary of patch, up and dup command
   (FATE#318299)
 - search: Append 'l' to a locked items status tag (FATE#318299)
+- list locks: new command options --matches and --solvables
+  to see the resolvables matched by each lock defintion
+  (FATE#318299)
 - Table: fix details layout to handle multibyte strings correctly
 - Rug-compatible mode is no longer available.
 - Give ZYPPER_EXIT_ERR_COMMIT priority over ZYPPER_EXIT_ON_SIGNAL

diff --git a/zypper.spec.cmake b/zypper.spec.cmake
index d6d54c3..798c12d 100644 (file)
--- a/zypper.spec.cmake
+++ b/zypper.spec.cmake
@@ -106,9 +106,9 @@ cd build
 # Same codebase, but SLES may use it's own translation set.
 #     suse_version
 #      1110            SLES11
-#      1315            SLES12
+#      1315-1319       SLES12
 unset TRANSLATION_SET
-%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
+%if 0%{?suse_version} == 1110 || ( 0%{?suse_version} >= 1315 && 1 0%{?suse_version} <= 1319 )
 if [ -f ../po/sle-zypper-po.tar.bz2 ]; then
   export TRANSLATION_SET=sle-zypper
 fi