--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-639554.patch Fri Sep 23 13:16:54 2011 +0200
@@ -0,0 +1,28 @@
+# HG changeset patch
+# Parent cfb5f66680d999596106fcf9debe4bf35e4d7aac
+diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
+--- a/toolkit/mozapps/installer/packager.mk
++++ b/toolkit/mozapps/installer/packager.mk
+@@ -708,20 +708,22 @@ ifdef INSTALL_SDK # Here comes the hard
+ $(NSINSTALL) -D $(DESTDIR)$(includedir)
+ (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(includedir) && tar -xf -)
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)
+ (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
+ (cd $(DESTDIR)$(idldir) && tar -xf -)
+ # SDK directory is the libs + a bunch of symlinks
+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
++ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
+ if test -f $(DIST)/include/xpcom-config.h; then \
+ $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ fi
+ (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
++ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
+ ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
+ ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
+ endif # INSTALL_SDK
+
+ make-sdk:
--- a/series Fri Sep 16 11:36:16 2011 +0200
+++ b/series Fri Sep 23 13:16:54 2011 +0200
@@ -18,6 +18,7 @@
mozilla-sle11.patch
mozilla-linux3.patch
mozilla-curl.patch
+mozilla-639554.patch
# Firefox patches
firefox-browser-css.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-639554.patch Fri Sep 23 13:16:54 2011 +0200
@@ -0,0 +1,1 @@
+../mozilla-639554.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.changes Fri Sep 16 11:36:16 2011 +0200
+++ b/xulrunner/xulrunner.changes Fri Sep 23 13:16:54 2011 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 20 11:54:28 UTC 2011 - wr@rosenauer.org
+
+- install xpt.py into SDK (mozilla-639554.patch) (bnc#639554)
+
-------------------------------------------------------------------
Wed Sep 14 13:07:39 UTC 2011 - wr@rosenauer.org
--- a/xulrunner/xulrunner.spec Fri Sep 16 11:36:16 2011 +0200
+++ b/xulrunner/xulrunner.spec Fri Sep 23 13:16:54 2011 +0200
@@ -20,7 +20,7 @@
Name: xulrunner
-BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip pkg-config yasm nss-shared-helper-devel zip
+BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel nss-shared-helper-devel pkg-config python startup-notification-devel unzip yasm zip
%if %suse_version > 1110
BuildRequires: libiw-devel
BuildRequires: libproxy-devel
@@ -65,6 +65,7 @@
Patch13: mozilla-sle11.patch
Patch14: mozilla-linux3.patch
Patch15: mozilla-curl.patch
+Patch16: mozilla-639554.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js = %{version}
Requires(post): update-alternatives coreutils
@@ -127,6 +128,7 @@
Software Development Kit to embed XUL or Gecko into other applications.
%if %localize
+
%package translations-common
License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: Common translations for XULRunner
@@ -160,8 +162,8 @@
This package contains rarely used languages.
%endif
+%if %crashreporter
-%if %crashreporter
%package buildsymbols
License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: Breakpad buildsymbols for %{name}
@@ -189,7 +191,7 @@
%endif
%patch14 -p1
%patch15 -p1
-
+%patch16 -p1
%build
# no need to add build time to binaries
@@ -283,6 +285,8 @@
# preferences (to package in omni.jar)
cp %{SOURCE4} dist/bin/defaults/pref/all-openSUSE.js
%makeinstall STRIP=/bin/true
+# xpt.py is not executable
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/bin/xpt.py
# remove some executable permissions
find $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal} \
-type f -perm -111 -exec chmod a-x {} \;
@@ -478,6 +482,7 @@
%{_datadir}/xulrunner-%{version_internal}/
%if %localize
+
%files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root)
%dir %{_libdir}/xulrunner-%{version_internal}/
@@ -490,6 +495,7 @@
%endif
%if %crashreporter
+
%files buildsymbols
%defattr(-,root,root)
%{_datadir}/mozilla/