From 5f181f857d7f3be5b7186b68d60c3bf280022eeb Mon Sep 17 00:00:00 2001 From: Russell Golden Date: Aug 19 2013 14:57:54 +0000 Subject: Update spec to upstream 4.0.1. Rewrite install code to be universal forever. I hope. --- diff --git a/mozilla-https-everywhere.spec b/mozilla-https-everywhere.spec index 2280c8b..fa04bab 100644 --- a/mozilla-https-everywhere.spec +++ b/mozilla-https-everywhere.spec @@ -8,7 +8,7 @@ %global seamonkey_inst_dir %{moz_extensions}/%{seamonkey_app_id} Name: mozilla-https-everywhere -Version: 3.3.1 +Version: 4.0.1 Release: 1%{?dist} Summary: HTTPS/HSTS enforcement extension for Mozilla Firefox and SeaMonkey @@ -55,61 +55,12 @@ dos2unix -f LICENSE.txt %install rm -rf %{buildroot} -# top level files -install -Dp -m 644 chrome.manifest %{buildroot}%{firefox_inst_dir}/chrome.manifest -install -Dp -m 644 install.rdf %{buildroot}%{firefox_inst_dir}/install.rdf -install -Dp -m 644 Changelog %{buildroot}%{firefox_inst_dir}/Changelog -install -Dp -m 644 LICENSE.txt %{buildroot}%{firefox_inst_dir}/LICENSE.txt - -# chrome/content -install -dm 755 %{buildroot}%{firefox_inst_dir}/chrome/content -install -D -m 644 chrome/content/{about.xul,fetch-source.js,fetch-source.xul,meta-preferences.xul,observatory-popup.xul,observatory-preferences.xul,observatory-warning.xul,observatory-xul.js,preferences.css,preferences.js,preferences.xul,toolbar_button.js,toolbar_button.xul} %{buildroot}%{firefox_inst_dir}/chrome/content/ - -# chrome/content/code -install -dm 755 %{buildroot}%{firefox_inst_dir}/chrome/content/code -for f in chrome/content/code/*; do -install -Dpm 644 ${f} \ - %{buildroot}%{firefox_inst_dir}/${f} -done - -# chrome/content/rules -install -dm 755 %{buildroot}%{firefox_inst_dir}/chrome/content/rules -for f in chrome/content/rules/*; do -install -Dpm 644 ${f} \ - %{buildroot}%{firefox_inst_dir}/${f} -done - -# chrome/locale and everything in it -install -dm 755 %{buildroot}/%{firefox_inst_dir}/chrome/locale -for f in chrome/locale/*; do - install -dm 755 ${f} \ - %{buildroot}%{firefox_inst_dir}/${f} - for g in ${f}/*; do - install -Dpm 644 ${g} \ - %{buildroot}%{firefox_inst_dir}/${g} - done -done - -# chrome/skin -install -dm 755 %{buildroot}/%{firefox_inst_dir}/chrome/skin -for f in chrome/skin/*; do -install -Dpm 644 ${f} \ - %{buildroot}%{firefox_inst_dir}/${f} -done - -# components/ -install -dm 755 %{buildroot}/%{firefox_inst_dir}/components -for f in components/*; do -install -Dpm 644 ${f} \ - %{buildroot}%{firefox_inst_dir}/${f} -done - -# defaults/ -install -dm 755 %{buildroot}/%{firefox_inst_dir}/defaults -install -dm 755 %{buildroot}/%{firefox_inst_dir}/defaults/preferences -for f in defaults/preferences/*; do -install -Dpm 644 ${f} \ - %{buildroot}%{firefox_inst_dir}/${f} +for f in `find . -print | sed -e '/\.\/$/d'` ; do + if [ -d ${f} ] ; then + install -dm 755 %{buildroot}%{firefox_inst_dir}/${f} + else + install -pm 644 ${f} %{buildroot}%{firefox_inst_dir}/${f} + fi done # symlink from seamonkey extension to firefox extension @@ -128,6 +79,10 @@ rm -rf %{buildroot} %changelog +* Mon Aug 19 2013 Russell Golden - 4.0.1-1 +- Update to upstream 4.0.1. There were a lot of changes. + -- See https://www.eff.org/files/Changelog.txt for details. + * Sun Jul 28 2013 Russell Golden - 3.3.1-1 3.3.1 - [Wikimedia] removed mixedcontent