From d6a3e9a96ff96d02fa421c415ef3c78c9e09383c Mon Sep 17 00:00:00 2001 From: Alexandre Barbosa Date: Thu, 11 Dec 2014 13:05:27 -0500 Subject: [PATCH] patch for newer jquery-ui gem --- gitlab-7.5.2-jquery-ui-5.patch | 26 ++++++++++++++++++++++++++ gitlab.spec | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gitlab-7.5.2-jquery-ui-5.patch diff --git a/gitlab-7.5.2-jquery-ui-5.patch b/gitlab-7.5.2-jquery-ui-5.patch new file mode 100644 index 0000000..89c1ea4 --- /dev/null +++ b/gitlab-7.5.2-jquery-ui-5.patch @@ -0,0 +1,26 @@ +diff -Nru gitlab-7.5.2.orig/app/assets/javascripts/application.js.coffee gitlab-7.5.2/app/assets/javascripts/application.js.coffee +--- gitlab-7.5.2.orig/app/assets/javascripts/application.js.coffee 2014-12-11 12:58:48.412000000 -0500 ++++ gitlab-7.5.2/app/assets/javascripts/application.js.coffee 2014-12-11 12:59:16.902000000 -0500 +@@ -5,7 +5,7 @@ + # the compiled file. + # + #= require jquery +-#= require jquery.ui.all ++#= require jquery-ui + #= require jquery_ujs + #= require jquery.cookie + #= require jquery.endless-scroll +diff -Nru gitlab-7.5.2.orig/app/assets/stylesheets/application.scss gitlab-7.5.2/app/assets/stylesheets/application.scss +--- gitlab-7.5.2.orig/app/assets/stylesheets/application.scss 2014-12-11 12:58:48.418000000 -0500 ++++ gitlab-7.5.2/app/assets/stylesheets/application.scss 2014-12-11 13:00:04.418000000 -0500 +@@ -2,8 +2,8 @@ + * This is a manifest file that'll automatically include all the stylesheets available in this directory + * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + * the top of the compiled file, but it's generally better to create a new file per style scope. +- *= require jquery.ui.datepicker +- *= require jquery.ui.autocomplete ++ *= require jquery-ui/datepicker ++ *= require jquery-ui/autocomplete + *= require jquery.atwho + *= require select2 + *= require highlightjs.min diff --git a/gitlab.spec b/gitlab.spec index 67d1e31..33992d5 100644 --- a/gitlab.spec +++ b/gitlab.spec @@ -6,6 +6,7 @@ Group: Development/Tools License: Expat URL: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab Source0: %{name}-%{version}.tar.gz +Patch0: gitlab-7.5.2-jquery-ui-5.patch BuildArch: noarch BuildRequires: gitlab-deps Requires: gitlab-deps, git @@ -14,7 +15,8 @@ Requires: gitlab-deps, git GitLab %prep -%autosetup +%setup -q +%patch0 -p 1 %build cat > config/gitlab.yml <