Author: caillon
Update of /cvs/extras/rpms/xulrunner/F-9 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3482
Modified Files: xulrunner.spec Log Message: Fully rip out the branding foo
Index: xulrunner.spec =================================================================== RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- xulrunner.spec 31 Mar 2008 23:43:03 -0000 1.108 +++ xulrunner.spec 1 Apr 2008 00:40:59 -0000 1.109 @@ -2,30 +2,18 @@ %define nss_version 3.11.99.5 %define cairo_version 0.5
-%define official_branding 1 - %define version_internal 1.9pre
-%if ! %{official_branding} -%define cvsdate 20080327 -%define nightly .cvs%{cvsdate} -%else %define version_pre .beta5rc2 -%endif
Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.51%{?version_pre}%{?nightly}%{?dist} +Release: 0.51%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -%if %{official_branding} -%define tarball xulrunner-1.9b5-source.tar.bz2 -%else -%define tarball mozilla-%{cvsdate}.tar.bz2 -%endif -Source0: %{tarball} +Source0: xulrunner-1.9b5-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js #Source21: %{name}.sh.in @@ -46,15 +34,7 @@ # Other Patch107: mozilla-pkgconfig.patch
-%if %{official_branding} -# Required by Mozilla Corporation -
-%else -# Not yet approved by Mozillla Corporation - - -%endif
# ---------------------------------------------------
@@ -125,24 +105,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
#---------------------------------------------------------------------
@@ -211,15 +175,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
scm-commits@lists.fedoraproject.org