From d172a8ff7f7142520b581b843c4ce93a49461792 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Wed, 6 Oct 2010 05:01:32 +0200 Subject: [PATCH] provisionary --- pkg/fedora/diaspora.spec | 15 ++--- pkg/fedora/perm-fix.patch | 120 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 10 deletions(-) create mode 100644 pkg/fedora/perm-fix.patch diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec index 8ef7ba5eb..34c221a0f 100644 --- a/pkg/fedora/diaspora.spec +++ b/pkg/fedora/diaspora.spec @@ -16,6 +16,9 @@ BuildArch: noarch # See http://github.com/diaspora/diaspora/issues/issue/393 Patch0: source-fix.patch +# See: http://github.com/diaspora/diaspora/issues/issue/392 +Patch1: perm-fix.patch + BuildRequires: git Requires(pre): shadow-utils @@ -39,20 +42,12 @@ exit 0 %setup -q -n %{name}-%{version}-%{git_release} pushd master %patch0 -p1 +git apply %{_sourcedir}/perm-fix.patch popd - - mkdir master/tmp || : -#find . -name .git | xargs rm -rf || : -find . -type f -exec \ +find . -perm /u+x -type f -exec \ sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|' {} \; > /dev/null -# Patch request: http://github.com/diaspora/diaspora/issues/issue/392 -find . -name \*.css -print0 | xargs --null chmod 644 -find . -name \*.js -print0 | xargs --null chmod 644 -chmod 644 master/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg -chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html - %build rm -rf master/vendor/bundle pushd master diff --git a/pkg/fedora/perm-fix.patch b/pkg/fedora/perm-fix.patch new file mode 100644 index 000000000..b6fabed52 --- /dev/null +++ b/pkg/fedora/perm-fix.patch @@ -0,0 +1,120 @@ +diff --git a/public/javascripts/fancybox/blank.gif b/public/javascripts/fancybox/blank.gif +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_close.png b/public/javascripts/fancybox/fancy_close.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_loading.png b/public/javascripts/fancybox/fancy_loading.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_nav_left.png b/public/javascripts/fancybox/fancy_nav_left.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_nav_right.png b/public/javascripts/fancybox/fancy_nav_right.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_shadow_e.png b/public/javascripts/fancybox/fancy_shadow_e.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_shadow_n.png b/public/javascripts/fancybox/fancy_shadow_n.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_shadow_ne.png b/public/javascripts/fancybox/fancy_shadow_ne.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_shadow_nw.png b/public/javascripts/fancybox/fancy_shadow_nw.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_shadow_s.png b/public/javascripts/fancybox/fancy_shadow_s.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_shadow_se.png b/public/javascripts/fancybox/fancy_shadow_se.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_shadow_sw.png b/public/javascripts/fancybox/fancy_shadow_sw.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_shadow_w.png b/public/javascripts/fancybox/fancy_shadow_w.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_title_left.png b/public/javascripts/fancybox/fancy_title_left.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_title_main.png b/public/javascripts/fancybox/fancy_title_main.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_title_over.png b/public/javascripts/fancybox/fancy_title_over.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancy_title_right.png b/public/javascripts/fancybox/fancy_title_right.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancybox-x.png b/public/javascripts/fancybox/fancybox-x.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancybox-y.png b/public/javascripts/fancybox/fancybox-y.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/fancybox.png b/public/javascripts/fancybox/fancybox.png +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/jquery.easing-1.3.pack.js b/public/javascripts/fancybox/jquery.easing-1.3.pack.js +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.css b/public/javascripts/fancybox/jquery.fancybox-1.3.1.css +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.js +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js b/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/fileuploader.js b/public/javascripts/fileuploader.js +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js b/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/jquery.infieldlabel.js b/public/javascripts/jquery.infieldlabel.js +old mode 100755 +new mode 100644 +diff --git a/public/javascripts/web_socket.js b/public/javascripts/web_socket.js +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/blueprint/src/grid.css b/public/stylesheets/blueprint/src/grid.css +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/blueprint/src/print.css b/public/stylesheets/blueprint/src/print.css +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/blueprint/src/reset.css b/public/stylesheets/blueprint/src/reset.css +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.eot b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.eot +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.ttf b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.ttf +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.woff b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.woff +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/brandongrotesque_light/demo.html b/public/stylesheets/brandongrotesque_light/demo.html +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/brandongrotesque_light/stylesheet.css b/public/stylesheets/brandongrotesque_light/stylesheet.css +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/fileuploader.css b/public/stylesheets/fileuploader.css +old mode 100755 +new mode 100644 +diff --git a/public/stylesheets/loading.gif b/public/stylesheets/loading.gif +old mode 100755 +new mode 100644