From 2ca3b4c3dad973fd88b7013be92bdd9b87d2eb20 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: May 08 2015 23:07:17 +0000 Subject: Fix font-awesome paths (bug #1219956) --- diff --git a/ipython-2.1.0-fontawesome4.patch b/ipython-2.1.0-fontawesome4.patch deleted file mode 100644 index 6e785e1..0000000 --- a/ipython-2.1.0-fontawesome4.patch +++ /dev/null @@ -1,144 +0,0 @@ -commit 716862fc302c447d756e1c2075c5136e6c9c60b0 -Author: Thomas Spura -Date: Sun Jul 6 13:11:20 2014 +0200 - - Port to fontawesome4 - -diff --git a/IPython/html/static/notebook/js/maintoolbar.js b/IPython/html/static/notebook/js/maintoolbar.js -index 01af262..c957bfe 100644 ---- a/IPython/html/static/notebook/js/maintoolbar.js -+++ b/IPython/html/static/notebook/js/maintoolbar.js -@@ -27,7 +27,7 @@ var IPython = (function (IPython) { - { - id : 'save_b', - label : 'Save and Checkpoint', -- icon : 'icon-save', -+ icon : 'fa fa-save', - callback : function () { - IPython.notebook.save_checkpoint(); - } -@@ -38,7 +38,7 @@ var IPython = (function (IPython) { - { - id : 'insert_below_b', - label : 'Insert Cell Below', -- icon : 'icon-plus-sign', -+ icon : 'fa fa-plus', - callback : function () { - IPython.notebook.insert_cell_below('code'); - IPython.notebook.select_next(); -@@ -51,7 +51,7 @@ var IPython = (function (IPython) { - { - id : 'cut_b', - label : 'Cut Cell', -- icon : 'icon-cut', -+ icon : 'fa fa-cut', - callback : function () { - IPython.notebook.cut_cell(); - } -@@ -59,7 +59,7 @@ var IPython = (function (IPython) { - { - id : 'copy_b', - label : 'Copy Cell', -- icon : 'icon-copy', -+ icon : 'fa fa-copy', - callback : function () { - IPython.notebook.copy_cell(); - } -@@ -67,7 +67,7 @@ var IPython = (function (IPython) { - { - id : 'paste_b', - label : 'Paste Cell Below', -- icon : 'icon-paste', -+ icon : 'fa fa-paste', - callback : function () { - IPython.notebook.paste_cell_below(); - } -@@ -78,7 +78,7 @@ var IPython = (function (IPython) { - { - id : 'move_up_b', - label : 'Move Cell Up', -- icon : 'icon-arrow-up', -+ icon : 'fa fa-arrow-up', - callback : function () { - IPython.notebook.move_cell_up(); - } -@@ -86,7 +86,7 @@ var IPython = (function (IPython) { - { - id : 'move_down_b', - label : 'Move Cell Down', -- icon : 'icon-arrow-down', -+ icon : 'fa fa-arrow-down', - callback : function () { - IPython.notebook.move_cell_down(); - } -@@ -98,7 +98,7 @@ var IPython = (function (IPython) { - { - id : 'run_b', - label : 'Run Cell', -- icon : 'icon-play', -+ icon : 'fa fa-play', - callback : function () { - // emulate default shift-enter behavior - IPython.notebook.execute_cell_and_select_below(); -@@ -107,7 +107,7 @@ var IPython = (function (IPython) { - { - id : 'interrupt_b', - label : 'Interrupt', -- icon : 'icon-stop', -+ icon : 'fa fa-stop', - callback : function () { - IPython.notebook.session.interrupt_kernel(); - } -@@ -115,7 +115,7 @@ var IPython = (function (IPython) { - { - id : 'repeat_b', - label : 'Restart Kernel', -- icon : 'icon-repeat', -+ icon : 'fa fa-repeat', - callback : function () { - IPython.notebook.restart_kernel(); - } -diff --git a/IPython/html/static/notebook/less/notificationarea.less b/IPython/html/static/notebook/less/notificationarea.less -index 5b3fd52..00073c0 100644 ---- a/IPython/html/static/notebook/less/notificationarea.less -+++ b/IPython/html/static/notebook/less/notificationarea.less -@@ -28,19 +28,19 @@ - } - - .edit_mode_icon:before { -- .icon(@pencil); -+ content: @fa-var-pencil; - } - - .command_mode_icon:before { -- .icon(' '); -+ content: ' '; - } - - .kernel_idle_icon:before { -- .icon(@circle-blank); -+ content: @fa-var-circle-o; - } - - .kernel_busy_icon:before { -- .icon(@circle); -+ content: @fa-var-circle; - } - - -diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less -index 1827f97..a480d67 100644 ---- a/IPython/html/static/tree/less/tree.less -+++ b/IPython/html/static/tree/less/tree.less -@@ -141,9 +141,9 @@ input.engine_num_input { - } - - .folder_icon:before { -- .icon(@folder-close-alt) -+ content: @fa-var-folder-o - } - - .notebook_icon:before { -- .icon(@book) -+ content: @fa-var-book - } diff --git a/ipython-2.4.1-fontawesome4.patch b/ipython-2.4.1-fontawesome4.patch new file mode 100644 index 0000000..f19b264 --- /dev/null +++ b/ipython-2.4.1-fontawesome4.patch @@ -0,0 +1,147 @@ +diff -up ipython-2.4.1/IPython/html/static/notebook/js/maintoolbar.js.fontawesome4 ipython-2.4.1/IPython/html/static/notebook/js/maintoolbar.js +--- ipython-2.4.1/IPython/html/static/notebook/js/maintoolbar.js.fontawesome4 2015-02-09 15:59:57.000000000 -0700 ++++ ipython-2.4.1/IPython/html/static/notebook/js/maintoolbar.js 2015-05-08 16:59:45.309052483 -0600 +@@ -27,7 +27,7 @@ var IPython = (function (IPython) { + { + id : 'save_b', + label : 'Save and Checkpoint', +- icon : 'icon-save', ++ icon : 'fa fa-save', + callback : function () { + IPython.notebook.save_checkpoint(); + } +@@ -38,7 +38,7 @@ var IPython = (function (IPython) { + { + id : 'insert_below_b', + label : 'Insert Cell Below', +- icon : 'icon-plus-sign', ++ icon : 'fa fa-plus', + callback : function () { + IPython.notebook.insert_cell_below('code'); + IPython.notebook.select_next(); +@@ -51,7 +51,7 @@ var IPython = (function (IPython) { + { + id : 'cut_b', + label : 'Cut Cell', +- icon : 'icon-cut', ++ icon : 'fa fa-cut', + callback : function () { + IPython.notebook.cut_cell(); + } +@@ -59,7 +59,7 @@ var IPython = (function (IPython) { + { + id : 'copy_b', + label : 'Copy Cell', +- icon : 'icon-copy', ++ icon : 'fa fa-copy', + callback : function () { + IPython.notebook.copy_cell(); + } +@@ -67,7 +67,7 @@ var IPython = (function (IPython) { + { + id : 'paste_b', + label : 'Paste Cell Below', +- icon : 'icon-paste', ++ icon : 'fa fa-paste', + callback : function () { + IPython.notebook.paste_cell_below(); + } +@@ -78,7 +78,7 @@ var IPython = (function (IPython) { + { + id : 'move_up_b', + label : 'Move Cell Up', +- icon : 'icon-arrow-up', ++ icon : 'fa fa-arrow-up', + callback : function () { + IPython.notebook.move_cell_up(); + } +@@ -86,7 +86,7 @@ var IPython = (function (IPython) { + { + id : 'move_down_b', + label : 'Move Cell Down', +- icon : 'icon-arrow-down', ++ icon : 'fa fa-arrow-down', + callback : function () { + IPython.notebook.move_cell_down(); + } +@@ -98,7 +98,7 @@ var IPython = (function (IPython) { + { + id : 'run_b', + label : 'Run Cell', +- icon : 'icon-play', ++ icon : 'fa fa-play', + callback : function () { + // emulate default shift-enter behavior + IPython.notebook.execute_cell_and_select_below(); +@@ -107,7 +107,7 @@ var IPython = (function (IPython) { + { + id : 'interrupt_b', + label : 'Interrupt', +- icon : 'icon-stop', ++ icon : 'fa fa-stop', + callback : function () { + IPython.notebook.session.interrupt_kernel(); + } +@@ -115,7 +115,7 @@ var IPython = (function (IPython) { + { + id : 'repeat_b', + label : 'Restart Kernel', +- icon : 'icon-repeat', ++ icon : 'fa fa-repeat', + callback : function () { + IPython.notebook.restart_kernel(); + } +diff -up ipython-2.4.1/IPython/html/static/notebook/less/notificationarea.less.fontawesome4 ipython-2.4.1/IPython/html/static/notebook/less/notificationarea.less +--- ipython-2.4.1/IPython/html/static/notebook/less/notificationarea.less.fontawesome4 2015-02-09 15:59:57.000000000 -0700 ++++ ipython-2.4.1/IPython/html/static/notebook/less/notificationarea.less 2015-05-08 16:59:45.310052478 -0600 +@@ -17,19 +17,19 @@ + } + + .edit_mode_icon:before { +- .icon(@pencil); ++ content: @fa-var-pencil; + } + + .command_mode_icon:before { +- .icon(' '); ++ content: ' '; + } + + .kernel_idle_icon:before { +- .icon(@circle-blank); ++ content: @fa-var-circle-o; + } + + .kernel_busy_icon:before { +- .icon(@circle); ++ content: @fa-var-circle; + } + + +diff -up ipython-2.4.1/IPython/html/static/style/style.less.fontawesome4 ipython-2.4.1/IPython/html/static/style/style.less +--- ipython-2.4.1/IPython/html/static/style/style.less.fontawesome4 2015-02-09 15:59:57.000000000 -0700 ++++ ipython-2.4.1/IPython/html/static/style/style.less 2015-05-08 17:00:15.688893090 -0600 +@@ -4,7 +4,7 @@ + + // Font-Awesome + @import "../components/font-awesome/less/font-awesome.less"; +-@FontAwesomePath: "../components/font-awesome/font"; ++@fa-font-path: "../components/font-awesome/font"; + + // base + @import "../base/less/style.less"; +diff -up ipython-2.4.1/IPython/html/static/tree/less/tree.less.fontawesome4 ipython-2.4.1/IPython/html/static/tree/less/tree.less +--- ipython-2.4.1/IPython/html/static/tree/less/tree.less.fontawesome4 2015-02-09 15:59:57.000000000 -0700 ++++ ipython-2.4.1/IPython/html/static/tree/less/tree.less 2015-05-08 16:59:45.310052478 -0600 +@@ -128,9 +128,9 @@ input.engine_num_input { + } + + .folder_icon:before { +- .icon(@folder-close-alt) ++ content: @fa-var-folder-o + } + + .notebook_icon:before { +- .icon(@book) ++ content: @fa-var-book + } diff --git a/ipython.spec b/ipython.spec index 4db9a4d..ca56219 100644 --- a/ipython.spec +++ b/ipython.spec @@ -17,7 +17,7 @@ Name: ipython Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An enhanced interactive Python shell Group: Development/Libraries @@ -31,7 +31,7 @@ Source0: https://pypi.python.org/packages/source/i/ipython/ipython-%{vers Patch0: ipython-2.1.0-_jsdir-search-path.patch # Port to fontawesome 4 # Sent upstream: https://github.com/ipython/ipython/pull/6084 -Patch1: ipython-2.1.0-fontawesome4.patch +Patch1: ipython-2.4.1-fontawesome4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -718,6 +718,9 @@ popd %endif # with_python3 %changelog +* Fri May 8 2015 Orion Poplawski - 2.4.1-2 +- Fix font-awesome paths (bug #1219956) + * Thu Feb 26 2015 Orion Poplawski - 2.4.1-1 - update to 2.4.1