SPECS (DEVEL): mozilla-firefox.spec - patch4 is illegal if officia...

[patrys]

Author: patrys                       Date: Wed Nov 22 08:47:10 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- patch4 is illegal if official branding is off

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.95.2.56 -> 1.95.2.57) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.95.2.56 SPECS/mozilla-firefox.spec:1.95.2.57
--- SPECS/mozilla-firefox.spec:1.95.2.56	Wed Nov 22 00:10:15 2006
+++ SPECS/mozilla-firefox.spec	Wed Nov 22 09:47:05 2006
@@ -31,7 +31,7 @@
 Source2:	%{name}.sh
 Patch1:		%{name}-lib_path.patch
 Patch3:		%{name}-nopangoxft.patch
-Patch4:		%{name}-name.patch
+#Patch4:		%{name}-name.patch
 Patch5:		%{name}-fonts.patch
 # if ac rebuild is needed...
 #PatchX:		%{name}-ac.patch
@@ -118,7 +118,7 @@
 cd mozilla
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
+#%%patch4 -p1
 %patch5 -p1
 
 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
@@ -175,11 +175,9 @@
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-gnomeui
 %endif
-ac_add_options --disable-dtd-debug
 ac_add_options --disable-freetype2
 ac_add_options --disable-installer
 ac_add_options --disable-jsd
-ac_add_options --disable-ldap
 ac_add_options --disable-updater
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --enable-system-cairo
@@ -372,6 +370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.57  2006/11/22 08:47:05  patrys
+- patch4 is illegal if official branding is off
+
 Revision 1.95.2.56  2006/11/21 23:10:15  patrys
 - further cuts of unneeded options
 - same bug remains
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.95.2.56&r2=1.95.2.57&f=u