packages: xulrunner/xulrunner-install.patch, xulrunner/xulrunner.spec - mov...

[glen]

Author: glen                         Date: Wed Aug 18 08:23:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move progs to bindir that can work outside xulrunner dir

---- Files affected:
packages/xulrunner:
   xulrunner-install.patch (1.7 -> 1.8) , xulrunner.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner-install.patch
diff -u packages/xulrunner/xulrunner-install.patch:1.7 packages/xulrunner/xulrunner-install.patch:1.8
--- packages/xulrunner/xulrunner-install.patch:1.7	Thu Jan 21 14:23:17 2010
+++ packages/xulrunner/xulrunner-install.patch	Wed Aug 18 10:23:01 2010
@@ -28,7 +28,7 @@
  	@echo "Linking XPT files..."
  	@rm -rf $(DIST)/xpt
  	@$(NSINSTALL) -D $(DIST)/xpt
-@@ -450,24 +450,33 @@
+@@ -450,24 +450,27 @@
  	$(error "make install" is not supported on this platform. Use "make package" instead.)
  endif
  	$(NSINSTALL) -D $(DESTDIR)$(installdir)
@@ -38,16 +38,10 @@
  	$(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)
-+	$(RM) -f $(DESTDIR)$(bindir)/regxpcom
-+	ln -s $(installdir)/regxpcom $(DESTDIR)$(bindir)/regxpcom
-+	$(RM) -f $(DESTDIR)$(bindir)/xpcshell
-+	ln -s $(installdir)/xpcshell $(DESTDIR)$(bindir)/xpcshell
-+	$(RM) -f $(DESTDIR)$(bindir)/xpidl
-+	ln -s $(installdir)/xpidl $(DESTDIR)$(bindir)/xpidl
-+	$(RM) -f $(DESTDIR)$(bindir)/xpt_dump
-+	ln -s $(installdir)/xpt_dump $(DESTDIR)$(bindir)/xpt_dump
-+	$(RM) -f $(DESTDIR)$(bindir)/xpt_link
-+	ln -s $(installdir)/xpt_link $(DESTDIR)$(bindir)/xpt_link
++	mv $(DESTDIR)$(MOZ_PKG_APPDIR)/regxpcom $(DESTDIR)$(bindir)/regxpcom
++	mv $(DESTDIR)$(MOZ_PKG_APPDIR)/xpidl $(DESTDIR)$(bindir)/xpidl
++	mv $(DESTDIR)$(MOZ_PKG_APPDIR)/xpt_dump $(DESTDIR)$(bindir)/xpt_dump
++	mv $(DESTDIR)$(MOZ_PKG_APPDIR)/xpt_link $(DESTDIR)$(bindir)/xpt_link
  ifdef INSTALL_SDK # Here comes the hard part
  	$(NSINSTALL) -D $(DESTDIR)$(includedir)
 -	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \

================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.153 packages/xulrunner/xulrunner.spec:1.154
--- packages/xulrunner/xulrunner.spec:1.153	Sun Aug 15 09:33:50 2010
+++ packages/xulrunner/xulrunner.spec	Wed Aug 18 10:23:01 2010
@@ -29,7 +29,7 @@
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
 Version:	%{xulrunner_ver}
-Release:	2
+Release:	2.2
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
@@ -329,12 +329,11 @@
 # files created by regxpcom
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
-install obj-%{_target_cpu}/dist/bin/regxpcom $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 %{__make} -C obj-%{_target_cpu}/build/unix install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# act like xulrunner --register-global was run
+# act like "xulrunner --register-global" was run
 mv $RPM_BUILD_ROOT/etc/gre.d/%{version}{.system,}.conf
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
@@ -344,6 +343,7 @@
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -537,12 +537,8 @@
 %attr(755,root,root) %{_bindir}/xpidl
 %attr(755,root,root) %{_bindir}/xpt_dump
 %attr(755,root,root) %{_bindir}/xpt_link
-%attr(755,root,root) %{_libdir}/%{name}/regxpcom
-%attr(755,root,root) %{_libdir}/%{name}/xpcshell
-%attr(755,root,root) %{_libdir}/%{name}/xpidl
-%attr(755,root,root) %{_libdir}/%{name}/xpt_dump
-%attr(755,root,root) %{_libdir}/%{name}/xpt_link
 %attr(755,root,root) %{_libdir}/%{name}/xulrunner-stub
+%attr(755,root,root) %{_libdir}/%{name}/xpcshell
 %{_includedir}/%{name}
 %{_datadir}/idl/%{name}
 %{_libdir}/%{name}-sdk
@@ -570,6 +566,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2010/08/18 08:23:01  glen
+- move progs to bindir that can work outside xulrunner dir
+
 Revision 1.153  2010/08/15 07:33:50  arekm
 - release 2
 
@@ -594,8 +593,8 @@
 
 Revision 1.146  2010/04/03 15:33:38  duddits
 - "this is wrong, those are already provided by nss" said Fryderyk
-Dziarmagowski and he was right, obviously. There's no need to add
-those libs. Reverted.
+  Dziarmagowski and he was right, obviously. There's no need to add
+  those libs. Reverted.
 - rel. 2
 
 Revision 1.145  2010/04/03 13:52:23  duddits
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-install.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.153&r2=1.154&f=u