diff options
| -rw-r--r-- | bluegriffon-build.patch | 13 | ||||
| -rw-r--r-- | bluegriffon-prefs.patch | 11 | ||||
| -rw-r--r-- | bluegriffon.spec | 15 |
3 files changed, 22 insertions, 17 deletions
diff --git a/bluegriffon-build.patch b/bluegriffon-build.patch index bf1450e..97c2ba6 100644 --- a/bluegriffon-build.patch +++ b/bluegriffon-build.patch @@ -1,15 +1,18 @@ ---- bluegriffon/langpacks/Makefile.in.build 2011-04-30 12:59:38.000000000 +0200 -+++ bluegriffon/langpacks/Makefile.in 2011-05-01 19:45:22.417064996 +0200 -@@ -20,9 +20,9 @@ +--- bluegriffon/langpacks/Makefile.in.build 2011-05-30 12:43:10.000000000 +0200 ++++ bluegriffon/langpacks/Makefile.in 2011-06-10 22:07:36.878502982 +0200 +@@ -26,12 +26,12 @@ mkdir -p $(FINAL_TARGET)/distribution/extensions rm -f $(FINAL_TARGET)/distribution/extensions/*.xpi rm -f $(srcdir)/*.xpi - $(foreach f,$^, cd $(srcdir)/`basename $f`; zip -qr ../langpack-`basename $f`@bluegriffon.org.xpi . ;) - $(foreach f,$^, cd $(topsrcdir)/bluegriffon/locales/`basename $f`; zip -qr $(topsrcdir)/bluegriffon/langpacks/langpack-`basename $f`@bluegriffon.org.xpi . ;) -- $(INSTALL) $(srcdir)/*.xpi $(DIST)/bin/distribution/extensions + $(foreach f,$^, cd `basename $f`; zip -qr ../langpack-`basename $f`@bluegriffon.org.xpi . ; cd .. ; ) + $(foreach f,$^, cd ../locales/`basename $f`; zip -qr ../../langpacks/langpack-`basename $f`@bluegriffon.org.xpi . ; cd .. ; ) + ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) + $(INSTALL) $(srcdir)/*.xpi $(DIST)/$(APP_NAME).app/Contents/MacOS/distribution/extensions + else +- $(INSTALL) $(srcdir)/*.xpi $(DIST)/bin/distribution/extensions + $(INSTALL) $(srcdir)/*.xpi $(DIST)/bin/extensions + endif include $(topsrcdir)/config/rules.mk - diff --git a/bluegriffon-prefs.patch b/bluegriffon-prefs.patch index 0ce98b9..b9857ac 100644 --- a/bluegriffon-prefs.patch +++ b/bluegriffon-prefs.patch @@ -1,6 +1,6 @@ ---- bluegriffon/app/profile/bluegriffon-prefs.js.orig 2011-05-09 19:00:50.365129800 +0200 -+++ bluegriffon/app/profile/bluegriffon-prefs.js 2011-05-09 19:01:17.667204761 +0200 -@@ -105,8 +105,8 @@ +--- bluegriffon/app/profile/bluegriffon-prefs.js.rpmprefs 2011-06-01 17:10:02.000000000 +0200 ++++ bluegriffon/app/profile/bluegriffon-prefs.js 2011-06-10 22:11:11.582111789 +0200 +@@ -108,8 +108,8 @@ pref("bluegriffon.structurebar.role.show", true); // updates @@ -11,12 +11,11 @@ pref("html5.enable", true); pref("bluegriffon.defaults.doctype", "kXHTML5"); -@@ -117,3 +117,8 @@ - pref("bluegriffon.tabs.position", "center"); +@@ -121,3 +121,7 @@ pref("bluegriffon.osx.dock-integration", true); + pref("extensions.getAddons.cache.enabled", false); + +// Locales +pref("general.useragent.locale", ""); +pref("intl.locale.matchOS", true); -+ diff --git a/bluegriffon.spec b/bluegriffon.spec index 5c79f4f..5eb1018 100644 --- a/bluegriffon.spec +++ b/bluegriffon.spec @@ -20,11 +20,11 @@ Summary: The next-generation Web Editor Summary(fr): La nouvelle génération d'éditeur web Name: bluegriffon -Version: 1.0 +Version: 1.1.1 %if %{?svnmain} Release: 0.2.svn%{svnmain}%{?dist} %else -Release: 4%{?dist} +Release: 1%{?dist} %endif URL: http://bluegriffon.org/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -37,8 +37,8 @@ Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}/source/fir # tar cjf bluegriffon-553.tar.bz2 bluegriffon Source1: %{name}-%{svnmain}.tar.bz2 %else -# svn export http://sources.disruptive-innovations.com/bluegriffon/tags/1.0 bluegriffon -# tar cjf bluegriffon-1.0.tar.bz2 bluegriffon +# svn export http://sources.disruptive-innovations.com/bluegriffon/tags/1.1.1 bluegriffon +# tar cjf bluegriffon-1.1.1.tar.bz2 bluegriffon Source1: %{name}-%{version}%{?prever}.tar.bz2 %endif @@ -47,8 +47,8 @@ Source1: %{name}-%{version}%{?prever}.tar.bz2 # tar cjf bluegriffon-l10n-58.tar.bz2 locales Source2: %{name}-l10n-%{svnlocales}.tar.bz2 %else -# svn export http://sources.disruptive-innovations.com/bluegriffon-l10n/tags/1.0 locales -# tar cjf bluegriffon-l10n-1.0.tar.bz2 locales +# svn export http://sources.disruptive-innovations.com/bluegriffon-l10n/tags/1.1.1 locales +# tar cjf bluegriffon-l10n-1.1.1.tar.bz2 locales Source2: %{name}-l10n-%{version}%{?prever}.tar.bz2 %endif @@ -345,6 +345,9 @@ update-desktop-database &> /dev/null || : %changelog +* Fri Jun 10 2011 Remi Collet <rpms@famillecollet.com> - 1.1.1-1 +- BlueGriffon 1.1.1 "Gudea" + * Mon May 9 2011 Remi Collet <rpms@famillecollet.com> - 1.0-4 - BlueGriffon 1.0 "Zephyr" (tags/1.0 which is really 1.0 finale) - patch default prefs to disable update and enable OS locale |