packages: iceweasel/iceweasel-install.patch, iceweasel/iceweasel.spec - bui...

[arekm]

Author: arekm                        Date: Thu Jan 21 20:15:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds now

---- Files affected:
packages/iceweasel:
   iceweasel-install.patch (1.4 -> 1.5) , iceweasel.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-install.patch
diff -u packages/iceweasel/iceweasel-install.patch:1.4 packages/iceweasel/iceweasel-install.patch:1.5
--- packages/iceweasel/iceweasel-install.patch:1.4	Thu Jan 21 14:53:45 2010
+++ packages/iceweasel/iceweasel-install.patch	Thu Jan 21 21:15:14 2010
@@ -1,19 +1,22 @@
---- mozilla/toolkit/mozapps/installer/packager.mk.org	2010-01-21 13:25:04.436839154 +0100
-+++ mozilla/toolkit/mozapps/installer/packager.mk	2010-01-21 13:32:14.673453287 +0100
-@@ -362,11 +362,11 @@
+--- mozilla/toolkit/mozapps/installer/packager.mk.org	2010-01-21 21:10:00.234466295 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk	2010-01-21 21:10:29.847369216 +0100
+@@ -362,13 +362,13 @@
  # NOTE: this must be a tar now that dist links into the tree so that we
  # do not strip the binaries actually in the tree.
  	@echo "Creating package directory..."
 -	@mkdir $(DIST)/$(MOZ_PKG_DIR)
-+	@mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR) $(DESTDIR)/$(MOZ_PKG_APPDIR)
++	@mkdir -p $(DESTDIR)/$(MOZ_PKG_APPDIR)
  ifdef MOZ_PKG_MANIFEST
  	$(RM) -rf $(DIST)/xpt
  	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 -		 "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
-+		 "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
++		 "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_APPDIR))", \
  		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
- 	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
+-	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
++	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  else # !MOZ_PKG_MANIFEST
+ ifeq ($(MOZ_PKG_FORMAT),DMG)
+ # If UNIVERSAL_BINARY, the package will be made from an already-prepared
 @@ -377,11 +377,11 @@
  ifndef STAGE_SDK
  	@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.85 packages/iceweasel/iceweasel.spec:1.86
--- packages/iceweasel/iceweasel.spec:1.85	Thu Jan 21 14:53:45 2010
+++ packages/iceweasel/iceweasel.spec	Thu Jan 21 21:15:14 2010
@@ -396,11 +396,6 @@
 
 %dir %{_libdir}/%{name}/components
 
-%{_libdir}/%{name}/components/aboutCertError.js
-%{_libdir}/%{name}/components/aboutPrivateBrowsing.js
-%{_libdir}/%{name}/components/aboutRights.js
-%{_libdir}/%{name}/components/aboutRobots.js
-%{_libdir}/%{name}/components/aboutSessionRestore.js
 %{_libdir}/%{name}/components/browser.xpt
 %{_libdir}/%{name}/components/FeedConverter.js
 %{_libdir}/%{name}/components/FeedWriter.js
@@ -468,7 +463,6 @@
 %attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
 %endif
 
-%attr(755,root,root) %{_libdir}/%{name}/iceweasel
 %dir %{_libdir}/%{name}/plugins
 %if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
@@ -525,6 +519,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2010/01/21 20:15:14  arekm
+- builds now
+
 Revision 1.85  2010/01/21 13:53:45  arekm
 - update patches; branding patch still needs update
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-install.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.85&r2=1.86&f=u