rpms/openoffice.org/devel openoffice.org.spec,1.2268,1.2269

Caolan McNamara caolanm at fedoraproject.org
Sat Jul 3 19:49:28 UTC 2010 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28987

Modified Files:
	openoffice.org.spec 
Log Message:
clear trivial mixed-use-of-spaces-and-tabs warning


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2268
retrieving revision 1.2269
diff -u -p -r1.2268 -r1.2269
--- openoffice.org.spec	3 Jul 2010 19:30:25 -0000	1.2268
+++ openoffice.org.spec	3 Jul 2010 19:49:28 -0000	1.2269
@@ -2101,39 +2101,39 @@ mv -f $RPM_BUILD_ROOT/%{basisinstdir}/sh
 #langpack id, has help or not, autocorrection glob, script classification
 langpackdetails=\
 (\
-af	help	western		ar	help	ctl	\
-bg	help	western 	bn	help	western	\
-ca	help	western 	cs	help	western	\
-cy	nohelp	western 	da	help	western	\
-de	help	western 	el	help 	western	\
-es	help	western 	et	help	western	\
-eu	help	western 	fi	help	western	\
-fr	help	western 	ga	nohelp	western	\
-gl	help	western 	gu	nohelp	ctl	\
-pa-IN	help	ctl 		he	nohelp	ctl	\
-hi	help	ctl 		hu	help	western	\
-hr	nohelp	western 	it	help	western	\
-ja	help	cjk		ko	help	cjk	\
-lt	help	western 	ms	nohelp	western	\
-nb	help	western 	nl	help	western	\
-nn	help	western 	pl	help	western	\
-pt	help	western 	pt-BR	help	western	\
-ru	help	western 	sk	help	western	\
-sl	help	western 	sr	help	western	\
-sv	help	western 	ta	help	ctl	\
-th	help	ctlseqcheck 	tr	help	western	\
-zh-CN	help	cjk		zh-TW	help	cjk	\
-zu	help	western 	tn	help	western	\
-ts	help	western 	as	nohelp	western	\
-mr	nohelp	western		ml	nohelp	western	\
-or	nohelp	ctl		te	nohelp	western	\
-ur	nohelp	western		kn	nohelp	western	\
-xh	help	western		ve	help	western \
-st	help	western		ss	help	western \
-nr	help	western		ns	help	western	\
-dz      help    ctl		uk	help	western \
-sh	help	western		mai  	help	western \
-ro	nohelp	western
+af      help    western         ar      help    ctl     \
+bg      help    western         bn      help    western \
+ca      help    western         cs      help    western \
+cy      nohelp  western         da      help    western \
+de      help    western         el      help    western \
+es      help    western         et      help    western \
+eu      help    western         fi      help    western \
+fr      help    western         ga      nohelp  western \
+gl      help    western         gu      nohelp  ctl     \
+pa-IN   help    ctl             he      nohelp  ctl     \
+hi      help    ctl             hu      help    western \
+hr      nohelp  western         it      help    western \
+ja      help    cjk             ko      help    cjk     \
+lt      help    western         ms      nohelp  western \
+nb      help    western         nl      help    western \
+nn      help    western         pl      help    western \
+pt      help    western         pt-BR   help    western \
+ru      help    western         sk      help    western \
+sl      help    western         sr      help    western \
+sv      help    western         ta      help    ctl     \
+th      help    ctlseqcheck     tr      help    western \
+zh-CN   help    cjk             zh-TW   help    cjk     \
+zu      help    western         tn      help    western \
+ts      help    western         as      nohelp  western \
+mr      nohelp  western         ml      nohelp  western \
+or      nohelp  ctl             te      nohelp  western \
+ur      nohelp  western         kn      nohelp  western \
+xh      help    western         ve      help    western \
+st      help    western         ss      help    western \
+nr      help    western         ns      help    western \
+dz      help    ctl             uk      help    western \
+sh      help    western         mai     help    western \
+ro      nohelp  western
 )
 
 tar xzf %{SOURCE7}
@@ -2213,19 +2213,18 @@ rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/s
 pic=0
 executable=0
 for foo in `find $RPM_BUILD_ROOT/%{instdir} -name "*" -exec file {} \;| grep ": ELF" | cut -d: -f 1` ; do
-	chmod +wx $foo
-	ls -asl $foo
-        result=`readelf -d $foo | grep TEXTREL` || true
-        if [ "$result" != "" ]; then
-                echo "TEXTREL Warning: $foo is b0rked (-fpic missing)"
-                pic=1
-        fi
-        result=`readelf -l $foo | grep GNU_STACK | grep RWE` || true
-        if [ "$result" != "" ]; then
-                echo "GNU_STACK Warning: $foo is b0rked (-noexecstack missing)"
-                executable=1
-        fi
-
+    chmod +wx $foo
+    ls -asl $foo
+    result=`readelf -d $foo | grep TEXTREL` || true
+    if [ "$result" != "" ]; then
+        echo "TEXTREL Warning: $foo is b0rked (-fpic missing)"
+        pic=1
+    fi
+    result=`readelf -l $foo | grep GNU_STACK | grep RWE` || true
+    if [ "$result" != "" ]; then
+        echo "GNU_STACK Warning: $foo is b0rked (-noexecstack missing)"
+        executable=1
+    fi
 done
 if [ $pic == 1 ]; then false; fi
 if [ $executable == 1 ]; then false; fi
@@ -6149,8 +6148,8 @@ fi
 - rename and appropiately merge commited patches as their respective workspaces
 - drop rh200118.filter.xalanbroken.patch
 - try and drop
-	+ openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-	+ openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
+    + openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+    + openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
 
 * Wed Dec 13 2006 Caolán McNamara <caolanm at redhat.com> - 1:2.1.0-6.7
 - split out english dictionaries into hunspell-en
@@ -6376,27 +6375,27 @@ fi
 - rh#200703# -> openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
 - rh#200874# -> openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
 - rh#200728# ->
-	+ openoffice.org-2.0.3.ooo68047.vcl.zwj, don't drop zero width joiner
-	+ openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext, a bizarre, but
-	perfectly functional input method surrounding text implementation
-	based on the ATK bridge
+    + openoffice.org-2.0.3.ooo68047.vcl.zwj, don't drop zero width joiner
+    + openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext, a bizarre, but
+      perfectly functional input method surrounding text implementation
+      based on the ATK bridge
 - rh#200805# replace ooo58663 missing glyph patch -> workspace.icuupgrade
 - rh#201143# more Indian langpacks
 - rh#201305# digital signature compile flags mismatch
 - 2.0.4+ accepted
-	+ ooo#66510# recentlyused fix -> workspace.kendy10
-	+ ooo#66067# embeddedobj crash -> workspace.fwk40
-	+ ooo#65519# samba printing ->> workspace.fwk40
-	+ ooo#59997# defaultbullets -> workspace.opensymbol01
-	+ ooo#65081# switch layout -> workspace.os84
-	+ ooo#65308# notes paste -> workspace.impress96
-	+ ooo#19976# nofocussteal -> workspace.inplaceobjects
-	+ ooo#65318# agg24 -> workspace.thbpp4.patch
-	+ ooo#65767# menu key -> workspace.vcl60.patch
-	+ ooo#66851# x86_64 i18npool ->> workspace.sixtyfour06
-	+ ooo#67656# tabdialogs minimize -> workspace.vcl63
-	+ ooo#67750# dont expand title -> workspace.pb17
-	+ ooo#67750# dont expand title ->> workspace.pb17
+    + ooo#66510# recentlyused fix -> workspace.kendy10
+    + ooo#66067# embeddedobj crash -> workspace.fwk40
+    + ooo#65519# samba printing ->> workspace.fwk40
+    + ooo#59997# defaultbullets -> workspace.opensymbol01
+    + ooo#65081# switch layout -> workspace.os84
+    + ooo#65308# notes paste -> workspace.impress96
+    + ooo#19976# nofocussteal -> workspace.inplaceobjects
+    + ooo#65318# agg24 -> workspace.thbpp4.patch
+    + ooo#65767# menu key -> workspace.vcl60.patch
+    + ooo#66851# x86_64 i18npool ->> workspace.sixtyfour06
+    + ooo#67656# tabdialogs minimize -> workspace.vcl63
+    + ooo#67750# dont expand title -> workspace.pb17
+    + ooo#67750# dont expand title ->> workspace.pb17
 
 * Wed Jul 26 2006 Caolán McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
 - rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
@@ -6410,7 +6409,7 @@ fi
 - require dejavu-lgc-fonts, Greek coverage problems begone
 - rh#200512# South African translations
 - move to firefox-devel instead of mozilla-devel, --with-firefox
-	+ add workspace.configure18.patch
+    + add workspace.configure18.patch
 
 * Thu Jul 20 2006 Caolán McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
 - rh#199535# presentation templates duplicated in zh-CN
@@ -6438,7 +6437,7 @@ fi
 - fix use of freetype headers for new freetype
 - rebuild for new tasty linker hash/new compiler
     + add openoffice.org.2.0.3.gcc28370.statics.patch to workaround gcc28370
-	-> drop with 4.1.1-8
+      -> drop with 4.1.1-8
     + add openoffice.org.2.0.3.gccXXXXX.anonymousexternc.patch for namespace { extern "C" ... }
     + add openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch to 
         workaround strict gcc ODR anon namespace handling
@@ -6460,7 +6459,7 @@ fi
 * Tue Jun 27 2006 Caolán McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone
 - track down vor and sdw crashes to some gcc problem with static initializers, 
-	failed to be able to find a standalone testcase though :-( => workaround
+    failed to be able to find a standalone testcase though :-( => workaround
 - add workspace.sixtyfour06.patch for x86_64 stability
 
 * Thu Jun 22 2006 Caolán McNamara <caolanm at redhat.com> - 1:2.0.3-6.1
@@ -6693,10 +6692,10 @@ fi
 - gcc#25389# fixed, drop jurt.nullpointer.patch
 - gcc#25426# identified, crash with jaxpapi patch
 - addressbooks
-	a) evo1 addressbook removed, as only evo2 required
-	b) mozilla addressbook removed, utterly useless
-	c) evo2 ldap addressbook added to give some sort of ldap access
-	d) patch wizard UI to show available addressbook backends
+    a) evo1 addressbook removed, as only evo2 required
+    b) mozilla addressbook removed, utterly useless
+    c) evo2 ldap addressbook added to give some sort of ldap access
+    d) patch wizard UI to show available addressbook backends
 - add openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch
 - upstream cocks up their numbering
 
@@ -6758,9 +6757,9 @@ fi
 - openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch -> javapatch
 - drop integrated openoffice.org-1.9.112.ooo53025.exception.package.patch
 - gcc#22132# fixed
-	+ drop openoffice.org-1.9.84.ooo44843.sdcasting.patch
-	+ drop openoffice.org-1.9.84.ooo44846.svxcasting.patch
-	+ drop openoffice.org-1.9.84.ooo45162.svxcasting2.patch
+    + drop openoffice.org-1.9.84.ooo44843.sdcasting.patch
+    + drop openoffice.org-1.9.84.ooo44846.svxcasting.patch
+    + drop openoffice.org-1.9.84.ooo45162.svxcasting2.patch
 - workaround deprecated openldap api usage
 - add industrial set of icons
 
@@ -6773,7 +6772,7 @@ fi
 - drop integrated openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
 - drop integrated openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
 - drop integrated workspace.vcl39.patch
-	- CACHE_MAGIC of rh2 changed back to default 2. No broken caches of "2" 
+    - CACHE_MAGIC of rh2 changed back to default 2. No broken caches of "2" 
         should exist to cause ambiguity
 - drop integrated openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
 - drop integrated openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
@@ -7317,8 +7316,8 @@ experimentation
         openoffice.org-1.9.89.ooo46228.parallel.solenv.patch
         openoffice.org-1.9.89.ooo46316.parallel.vcl.patch
         openoffice.org-1.9.89.ooo46389.parallel.framework.patch
-	openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
-	openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
+        openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
+        openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
 
 * Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com>
 - rebuilt
@@ -7388,8 +7387,8 @@ experimentation
 - bump to 1.9.81
 - drop integrated openoffice.org-1.9.77.ooo42152.gnomevfs.patch
 - with --with-system-stdlibs
-	rm -f $RPM_BUILD_ROOT/instdir/program/libgcc_s.so.*
-	rm -f $RPM_BUILD_ROOT/instdir/program/libstdc++.so.*
+    rm -f $RPM_BUILD_ROOT/instdir/program/libgcc_s.so.*
+    rm -f $RPM_BUILD_ROOT/instdir/program/libstdc++.so.*
   becomes redundant
 - --with-system-icu & --with-system-db3 no longer in --with-system-libs
 - sc needs another file in exceptions because of system-boost

More information about the scm-commits mailing list