commit 4e33ee49f8afd1f7896b47f25d3a1f8e04124b1a
Author: Jan Rękorajski <[email protected]>
Date: Thu May 16 16:50:55 2013 +0200
- updated install without patching
- updated files
xulrunner-install.patch | 51 -------------------------------------------------
xulrunner.spec | 40 ++++++++++++++++++++++++++++----------
2 files changed, 30 insertions(+), 61 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 79eba9a..31270d8 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -300,19 +300,42 @@ EOF
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
$RPM_BUILD_ROOT%{_datadir}/%{name}/components \
- $RPM_BUILD_ROOT%{_sbindir}
+ $RPM_BUILD_ROOT%{_bindir} \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/{lib,bin} \
+ $RPM_BUILD_ROOT%{_includedir}/%{name} \
+ $RPM_BUILD_ROOT%{_datadir}/idl/%{name} \
+ $RPM_BUILD_ROOT%{_pkgconfigdir}
cd mozilla/obj-%{_target_cpu}
-%{__make} -C xulrunner/installer stage-package \
+%{__make} -C xulrunner/installer stage-package libxul.pc libxul-embedding.pc
mozilla-js.pc mozilla-plugin.pc\
DESTDIR=$RPM_BUILD_ROOT \
installdir=%{_libdir}/%{name} \
INSTALL_SDK=1 \
PKG_SKIP_STRIP=1
-cp -a dist/xulrunner/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
-
-# fix for halfway done xulrunner-bin -> xulrunner rename
-#ln -sf %{_libdir}/%{name}/xulrunner $RPM_BUILD_ROOT%{_bindir}/xulrunner
+cp -aL xulrunner/installer/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+cp -aL dist/xulrunner/* $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -aL dist/include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -aL dist/include/xpcom-config.h $RPM_BUILD_ROOT%{_libdir}/%{name}-devel
+cp -aL dist/idl/* $RPM_BUILD_ROOT%{_datadir}/idl/%{name}
+cp -aL dist/sdk/lib/* $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib
+cp -aL dist/sdk/bin/* $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/bin
+find $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk -name "*.pyc" | xargs rm -f
+
+ln -s %{_libdir}/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/bin
+ln -s %{_includedir}/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/include
+ln -s %{_datadir}/idl/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/idl
+ln -s %{_libdir}/%{name}-devel/sdk/lib
$RPM_BUILD_ROOT%{_libdir}/%{name}-devel/lib
+
+# replace copies with symlinks
+ln -sf %{_libdir}/%{name}/libmozjs.so
$RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libmozjs.so
+ln -sf %{_libdir}/%{name}/libxpcom.so
$RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libxpcom.so
+ln -sf %{_libdir}/%{name}/libxul.so
$RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libxul.so
+ln -sf %{_libdir}/%{name}/libmozalloc.so
$RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libmozalloc.so
+# temp fix for https://bugzilla.mozilla.org/show_bug.cgi?id=63955
+chmod a+rx $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/bin/xpt.py
+
+ln -sf %{_libdir}/%{name}/xulrunner $RPM_BUILD_ROOT%{_bindir}/xulrunner
# move arch independant ones to datadir
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
$RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
@@ -324,9 +347,6 @@ ln -s %{_datadir}/myspell
$RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
-%{__make} -C build/unix install \
- DESTDIR=$RPM_BUILD_ROOT
-
# Install xpcshell and run-mozilla.sh
%{__cp} -pL dist/bin/xpcshell $RPM_BUILD_ROOT%{_libdir}/%{name}
%{__cp} -pL dist/bin/run-mozilla.sh $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -374,7 +394,7 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/plugin-container
%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
-%{_libdir}/%{name}/components/binary.manifest
+%{_libdir}/%{name}/components/components.manifest
# do not use *.dat here, so check-files can catch any new files
# (and they won't be just silently placed empty in rpm)
diff --git a/xulrunner-install.patch b/xulrunner-install.patch
deleted file mode 100644
index 51923c4..0000000
--- a/xulrunner-install.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- xulrunner-7.0/mozilla/toolkit/mozapps/installer/packager.mk.orig
2011-09-22 22:20:42.000000000 +0200
-+++ xulrunner-7.0/mozilla/toolkit/mozapps/installer/packager.mk
2011-09-28 11:14:05.247518747 +0200
-@@ -632,7 +632,7 @@
- @$(NSINSTALL) -D $(DIST)/xpt
- @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp
$(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces
$(MOZ_PKG_APPNAME).xpt\n"
>$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest)
|| echo No *.xpt files found in:
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
- else
-- @cd $(DIST)/bin && $(TAR) $(TAR_CREATE_FLAGS) - * | (cd
../$(MOZ_PKG_DIR); tar -xf -)
-+ cp -rfLp $(DIST)/bin/* $(MOZ_PKG_DIR)
- endif
- else
- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
-@@ -725,27 +725,30 @@
- $(error "make install" is not supported on this platform. Use "make
package" instead.)
- endif
- $(NSINSTALL) -D $(DESTDIR)$(installdir)
-- (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete
$(TAR_CREATE_FLAGS) - .) | \
-- (cd $(DESTDIR)$(installdir) && tar -xf -)
-+ cp -rfLp $(DIST)/$(MOZ_PKG_DIR)/* $(DESTDIR)$(installdir)
- $(NSINSTALL) -D $(DESTDIR)$(bindir)
- $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
-- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
-+ ln -s $(installdir)/$(MOZ_APP_NAME)-bin
$(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
- ifdef INSTALL_SDK # Here comes the hard part
- $(NSINSTALL) -D $(DESTDIR)$(includedir)
-- (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-- (cd $(DESTDIR)$(includedir) && tar -xf -)
-+ cp -rfLp $(DIST)/include/* $(DESTDIR)$(includedir)
- $(NSINSTALL) -D $(DESTDIR)$(idldir)
-- (cd $(DIST)/idl && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
-- (cd $(DESTDIR)$(idldir) && tar -xf -)
-+ cp -rfLp $(DIST)/idl/* $(DESTDIR)$(idldir)
- # 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
- find $(DIST)/sdk -name "*.pyc" | xargs rm -f
-- (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 -)
-+ cp -rfLp $(DIST)/sdk/lib/* $(DESTDIR)$(sdkdir)/sdk/lib
-+ cp -rfLp $(DIST)/sdk/bin/* $(DESTDIR)$(sdkdir)/sdk/bin
-+ # replace copies with symlinks
-+ ln -sf $(installdir)/libmozjs.so $(DESTDIR)$(sdkdir)/sdk/lib/libmozjs.so
-+ ln -sf $(installdir)/libxpcom.so $(DESTDIR)$(sdkdir)/sdk/lib/libxpcom.so
-+ ln -sf $(installdir)/libxul.so $(DESTDIR)$(sdkdir)/sdk/lib/libxul.so
-+ ln -sf $(installdir)/libmozalloc.so
$(DESTDIR)$(sdkdir)/sdk/lib/libmozalloc.so
-+ chmod a+rx $(DESTDIR)$(sdkdir)/sdk/bin/xpt.py # temp fix for
https://bugzilla.mozilla.org/show_bug.cgi?id=63955
- $(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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/0635a591ec882c75cf2d0290893857ab76ea1833
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
