rpms/openoffice.org/devel openoffice.org.spec, 1.1261, 1.1262 openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch, 1.2, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed Aug 22 11:16:35 UTC 2007 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23873

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch 
Log Message:
reshuffle patches


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1261
retrieving revision 1.1262
diff -u -r1.1261 -r1.1262
--- openoffice.org.spec	22 Aug 2007 10:10:51 -0000	1.1261
+++ openoffice.org.spec	22 Aug 2007 11:15:59 -0000	1.1262
@@ -64,17 +64,17 @@
 Patch1:  AutoSaveRecovery.xcu
 Patch2:  RegisterAndLicence.xcu
 Patch3:  AutoSaveCommon.xcu
-Patch4:  openoffice.org.langpack-cjk.template
-Patch5:  openoffice.org.langpack-help.template
-Patch6:  openoffice.org.langpack-common.template
-Patch7:  openoffice.org.langpack-lingu.template
-Patch8:  openoffice.org.langpack-ctl.template
-Patch9:  openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
-Patch10: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
-Patch12: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
-Patch13: openoffice.org-1.9.97.rh156067.noversionedsysui.patch
-Patch14: openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
+Patch4:  libtextcat.xcu
+Patch5:  openoffice.org.langpack-cjk.template
+Patch6:  openoffice.org.langpack-help.template
+Patch7:  openoffice.org.langpack-common.template
+Patch8:  openoffice.org.langpack-lingu.template
+Patch9:  openoffice.org.langpack-ctl.template
+Patch10: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
+Patch11: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch12: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
+Patch13: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
+Patch14: openoffice.org-1.9.97.rh156067.noversionedsysui.patch
 %if %{gtkprintui}
 Patch15: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
@@ -124,12 +124,11 @@
 Patch59: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
 Patch60: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
 Patch61: workspace.unifysound01.patch
-Patch62: libtextcat.xcu
-Patch63: workspace.npower7.patch
-Patch64: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch65: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch66: openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch
-Patch67: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch62: workspace.npower7.patch
+Patch63: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch64: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch65: openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch
+Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -998,13 +997,20 @@
 %prep
 %setup -q -n %{ooo_base_name}
 cp -p %{SOURCE1} extras/source/database/evolocal.odb
+(sed -e '/Sun/d' extras/source/palettes/standard.soc | head -n -1 && \
+ echo -e ' <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
+ <draw:color draw:name="Red Hat 2" draw:color="#0093d9"/> 
+ <draw:color draw:name="Red Hat 3" draw:color="#ff8d00"/>
+ <draw:color draw:name="Red Hat 4" draw:color="#abb400"/>
+ <draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
+ tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
+mv -f redhat.soc extras/source/palettes/standard.soc
 cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
-%patch9  -p1 -b .rh133741.alwaysgtk.desktop.patch
-%patch10 -p1 -b .rh161886.rpath.desktop.patch
-%patch11 -p1 -b .rh151357.setlangtolocale.patch
-%patch12 -p1 -b .rh151356.usetwodotzeropath.patch
-%patch13 -p1 -b .rh156067.noversionedsysui.patch
-%patch14 -p1
+%patch10 -p1 -b .rh133741.alwaysgtk.desktop.patch
+%patch11 -p1 -b .rh161886.rpath.desktop.patch
+%patch12 -p1 -b .rh151357.setlangtolocale.patch
+%patch13 -p1 -b .rh151356.usetwodotzeropath.patch
+%patch14 -p1 -b .rh156067.noversionedsysui.patch
 %if %{gtkprintui}
 %patch15 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
@@ -1058,11 +1064,11 @@
 %patch59 -p1 -b .ooo80257.sd.textonlystyle.patch
 tar xzf %{PATCH60}
 %patch61 -p1 -b .workspace.unifysound01.patch
-%patch63 -p1 -b .workspace.npower7.patch
-%patch64 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch65 -p1 -b .ooo80735.cppu.map.patch
-%patch66 -p1 -b .oooXXXXX.sd.sixtyfour.patch
-%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch62 -p1 -b .workspace.npower7.patch
+%patch63 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch64 -p1 -b .ooo80735.cppu.map.patch
+%patch65 -p1 -b .oooXXXXX.sd.sixtyfour.patch
+%patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -1213,7 +1219,7 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH3}
 #libtextcat fingerprint location
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH62}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH4}
 
 #add the debugging libsalalloc_malloc.so.3 library
 cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
@@ -1292,24 +1298,24 @@
 i=0
 while [ $i -lt ${#langpackdetails[@]} ]; do
    lang=${langpackdetails[$i]}
-   sed -e "s/LANG/$lang/g" %{PATCH6} > $lang.filelist
+   sed -e "s/LANG/$lang/g" %{PATCH7} > $lang.filelist
    i=$[i+1]
    help=${langpackdetails[$i]}
    if [ "$help" = "help" ]; then
-     sed -e "s/LANG/$lang/g" %{PATCH5} >> $lang.filelist
+     sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
    fi
    i=$[i+1]
    lingu=${langpackdetails[$i]}
    if [ ! "$lingu" = "nolingu" ]; then
-     sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH7} >> $lang.filelist
+     sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH8} >> $lang.filelist
    fi
    i=$[i+1]
    type=${langpackdetails[$i]}
    if [ "$type" = "ctl" ]; then
-     sed -e "s/LANG/$lang/g" %{PATCH8} >> $lang.filelist
+     sed -e "s/LANG/$lang/g" %{PATCH9} >> $lang.filelist
    fi
    if [ "$type" = "cjk" ]; then
-     sed -e "s/LANG/$lang/g"  %{PATCH4} >> $lang.filelist
+     sed -e "s/LANG/$lang/g"  %{PATCH5} >> $lang.filelist
    fi
    i=$[i+1]
 done


--- openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch DELETED ---

More information about the scm-commits mailing list