rpms/xulrunner/devel .cvsignore, 1.47, 1.48 sources, 1.49, 1.50 xulrunner.spec, 1.106, 1.107

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11242

Modified Files:
	.cvsignore sources xulrunner.spec 
Log Message:
* Mon Mar 31 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.51
- Update to latest trunk (2008-03-31)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	28 Mar 2008 01:31:29 -0000	1.47
+++ .cvsignore	1 Apr 2008 01:55:24 -0000	1.48
@@ -1 +1 @@
-mozilla-20080327.tar.bz2
+mozilla-20080331.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	28 Mar 2008 01:31:29 -0000	1.49
+++ sources	1 Apr 2008 01:55:24 -0000	1.50
@@ -1 +1 @@
-7f43fd0bdbf2709ba05cec41f43d2a36  mozilla-20080327.tar.bz2
+9c1fb20aac1ba29756ce9b002ecc7826  mozilla-20080331.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- xulrunner.spec	28 Mar 2008 01:31:29 -0000	1.106
+++ xulrunner.spec	1 Apr 2008 01:55:24 -0000	1.107
@@ -7,14 +7,14 @@
 %define version_internal  1.9pre
 
 %if ! %{official_branding}
-%define cvsdate 20080327
+%define cvsdate 20080331
 %define nightly .cvs%{cvsdate}
 %endif
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.50%{?nightly}%{?dist}
+Release:        0.51%{?nightly}%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -44,16 +44,6 @@
 # Other
 Patch107:       mozilla-pkgconfig.patch
 
-%if %{official_branding}
-# Required by Mozilla Corporation
-
-
-%else
-# Not yet approved by Mozillla Corporation
-
-
-%endif
-
 # ---------------------------------------------------
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -123,24 +113,8 @@
 
 %patch107 -p1 -b .pk
 
-
-# For branding specific patches.
-
-%if %{official_branding}
-# Required by Mozilla Corporation
-
-
-%else
-# Not yet approved by Mozilla Corporation
-
-
-%endif
-
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
-%if %{official_branding}
-%{__cat} %{SOURCE11} >> .mozconfig
-%endif
 
 #---------------------------------------------------------------------
 
@@ -209,15 +183,6 @@
 find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
 cd -
 
-%if %{official_branding}
-%{__mkdir_p} $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome/icons/default/
-%{__cp} other-licenses/branding/%{name}/default.xpm \
-        $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome/icons/default/ 
-%{__cp} other-licenses/branding/%{name}/default.xpm \
-        $RPM_BUILD_ROOT${MOZ_APP_DIR}/icons/
-%endif
-
-
 # system extensions and plugins support
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions
@@ -398,6 +363,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Mar 31 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.51
+- Update to latest trunk (2008-03-31)
+
 * Thu Mar 27 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.50
 - Update to latest trunk (2008-03-27)