Merge branch 'release/2.0'

openSUSE · Jun 19, 2015 · 4f60b8f · 4f60b8f
2 parents 1758f30 + 1dba563
commit 4f60b8f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 19 12:47:56 UTC 2015 - [email protected]
+
+Stable release 2.0
+
+- added latest products to .js file to create correct Bugzilla
+  links in Draft mode
+
 -------------------------------------------------------------------
 Thu Jun 11 12:50:28 UTC 2015 - [email protected]
 

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ endif
 
 SHELL         := /bin/bash
 PACKAGE       := suse-xsl-stylesheets
-VERSION       := 2.0~rc6
+VERSION       := 2.0
 SUSE_XML_PATH := $(PREFIX)/xml/suse
 DB_XML_PATH   := $(PREFIX)/xml/docbook
 SUSE_SCHEMA_PATH := $(SUSE_XML_PATH)/schema

diff --git a/packaging/suse-xsl-stylesheets.spec b/packaging/suse-xsl-stylesheets.spec
@@ -17,7 +17,7 @@
 
 
 Name:           suse-xsl-stylesheets
-Version:        2.0~rc6
+Version:        2.0
 Release:        0
 
 ###############################################################
@@ -46,7 +46,6 @@ Release:        0
 %define suse_schema_dir %{suse_xml_dir}/schema
 %define suse_styles_dir %{db_xml_dir}/stylesheet
 
-
 Summary:        SUSE-branded Docbook stylesheets for XSLT 1.0
 License:        GPL-2.0 or GPL-3.0
 Group:          Productivity/Publishing/XML
@@ -227,7 +226,6 @@ exit 0
 %dir %{_datadir}/suse-xsl-stylesheets/aspell
 
 %dir %{suse_xml_dir}
-%dir %{db_xml_dir}
 
 %dir %{suse_styles_dir}
 %dir %{suse_styles_dir}/suse

diff --git a/suse2013/static/js/script.js b/suse2013/static/js/script.js
@@ -27,6 +27,9 @@ switch ( XmlProduct ) {
   case 'SUSE Cloud 5':
     bugzillaProduct = 'SUSE Cloud 5';
     break;
+  case 'SUSE OpenStack Cloud 6':
+    bugzillaProduct = 'SUSE OpenStack Cloud 6';
+    break;
   case 'Subscription Management Tool 11.3':
     bugzillaProduct = 'Subscription Management Tool 11 SP3 (SMT 11 SP3)';
     bugzillaComponent = 'SMT';
@@ -37,6 +40,9 @@ switch ( XmlProduct ) {
   case 'SUSE Linux Enterprise Desktop 12':
     bugzillaProduct = 'SUSE Linux Enterprise Desktop 12';
     break;
+  case 'SUSE Linux Enterprise Desktop 12 SP1':
+    bugzillaProduct = 'SUSE Linux Enterprise Desktop 12 SP1 (SLED 12 SP1)';
+    break;
   case 'SUSE Linux Enterprise Desktop 11 SP4':
     bugzillaProduct = 'SUSE Linux Enterprise Desktop 11 SP4 (SLED 11 SP4)';
     break;
@@ -46,6 +52,9 @@ switch ( XmlProduct ) {
   case 'SUSE Linux Enterprise Server 12':
     bugzillaProduct = 'SUSE Linux Enterprise Server 12 (SLES 12)';
     break;
+  case 'SUSE Linux Enterprise Server 12 SP1':
+    bugzillaProduct = 'SUSE Linux Enterprise Server 12 SP1';
+    break;
   case 'SUSE Linux Enterprise Server 11 SP4':
     bugzillaProduct = 'SUSE Linux Enterprise Server 11 SP4 (SLES 11 SP4)';
     break;
@@ -63,26 +72,39 @@ switch ( XmlProduct ) {
   case 'Geo Clustering for SUSE Linux Enterprise High Availability Extension 11 SP4':
     bugzillaProduct = 'SUSE Linux Enterprise High Availability Extension 11 SP4';
     break;
-
   case 'SUSE Linux Enterprise High Availability Extension 12':
     bugzillaProduct = 'SUSE Linux Enterprise High Availability Extension 12';
     break;
   case 'Geo Clustering for SUSE Linux Enterprise High Availability Extension 12':
     bugzillaProduct = 'SUSE Linux Enterprise High Availability Extension 12';
     break;
+  case 'SUSE Linux Enterprise High Availability Extension 12 SP1':
+    bugzillaProduct = 'SUSE Linux Enterprise High Availability Extension 12 SP1';
+    break;
+  case 'Geo Clustering for SUSE Linux Enterprise High Availability Extension 12 SP1':
+    bugzillaProduct = 'SUSE Linux Enterprise High Availability Extension 12 SP1';
+    break;
   case 'SUSE Manager 1.7':
     bugzillaProduct = 'SUSE Manager 1.7 Server';
     break;
   case 'SUSE Manager 2.1':
     bugzillaProduct = 'SUSE Manager 2.1 Server';
     break;
+  case 'SUSE Manager 2.1 Proxy':
+    bugzillaProduct = 'SUSE Manager 2.1 Server Proxy';
+    break;
   case 'SUSE Studio Onsite 1.3':
     bugzillaProduct = 'SUSE Studio Onsite';
     break;
   case 'WebYaST 11':
     bugzillaProduct = 'WebYaST';
     bugzillaComponent = 'Documenation'; // sic!
     break;
+  case 'SUSE Linux Enterprise Real Time Extension 11 SP4':
+    bugzillaProduct = 'SUSE Linux Enterprise Real Time Extension 11 SP4 (SLERTE 11 SP4)';
+    bugzillaComponent = 'Other';
+    break;
+
 }
 
 var bugzillaURLprefix = 'https://bugzilla.suse.com/enter_bug.cgi?&product=' + encodeURIComponent(bugzillaProduct) + '&component=' + encodeURIComponent(bugzillaComponent);