From 4b182970e7dac0d8ef159c870bc33b877c658884 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 12 Jun 2011 20:17:06 +0200
Subject: bluegriffon 1.1.1, more work

---
 bluegriffon-build.patch | 7 +++++--
 bluegriffon.spec        | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bluegriffon-build.patch b/bluegriffon-build.patch
index 97c2ba6..32e6799 100644
--- a/bluegriffon-build.patch
+++ b/bluegriffon-build.patch
@@ -1,7 +1,10 @@
 --- 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 @@
++++ bluegriffon/langpacks/Makefile.in	2011-06-12 18:12:34.564228673 +0200
+@@ -24,14 +24,15 @@
+     
+ libs::$(_AVAILABLE_LOCALES)
  	mkdir -p $(FINAL_TARGET)/distribution/extensions
++	mkdir -p $(DIST)/bin/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 . ;)
diff --git a/bluegriffon.spec b/bluegriffon.spec
index 5eb1018..b19542a 100644
--- a/bluegriffon.spec
+++ b/bluegriffon.spec
@@ -82,6 +82,8 @@ Patch36:        xulrunner-omnijar.patch
 Patch100:       bluegriffon-build.patch
 Patch101:       bluegriffon-prefs.patch
 
+# bluegriffon/config/content.patch rewritted for 4.0.1
+Patch102:       bluegriffon-mozilla.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -188,7 +190,8 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %patch101  -p0 -b .rpmprefs
 
 # Patch provided in bluegriffon sources
-patch -p1 <bluegriffon/config/content.patch
+#patch -p1 -b -z .blue <bluegriffon/config/content.patch
+%patch102  -p1 -b .blue
 
 
 #See http://bluegriffon.org/pages/Build-BlueGriffon
@@ -284,6 +287,7 @@ make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 mkdir -p $RPM_BUILD_ROOT/%{mozappdir}
 tar --create --file - --dereference --directory=dist/bin --exclude xulrunner . \
   | tar --extract --file - --directory $RPM_BUILD_ROOT/%{mozappdir}
+cp bluegriffon/langpacks/langpack-*.xpi $RPM_BUILD_ROOT/%{mozappdir}/extensions
 
 # Launcher
 %if 0%{?gecko_version:1}
-- 
cgit