rpms/openoffice.org/devel openoffice.org.spec,1.2001,1.2002

Fri Sep 11 06:51:29 UTC 2009

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26764

Modified Files:
	openoffice.org.spec 
Log Message:
make oo.o buildable without langpacks again


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2001
retrieving revision 1.2002
diff -u -p -r1.2001 -r1.2002

--- openoffice.org.spec	8 Sep 2009 11:51:04 -0000	1.2001
+++ openoffice.org.spec	11 Sep 2009 06:51:26 -0000	1.2002
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -1778,9 +1778,11 @@ if ! build --dlv_switch -link --all $BUI
     build --dlv_switch -link --all
 fi
 deliver -link
+%if %{langpacks}
 # i99658
 cp %{SOURCE10} .
 localize -m -x -l or-IN -f or-IN_DEV300_m40.sdf
+%endif
 cd ../..
 
 pushd solver/%{OFFICEUPD}/unxlng*/bin
@@ -2072,6 +2074,7 @@ en_ZA_aliases="en-NA en-ZW"
 for lang in $en_ZA_aliases; do
         ln -sf acor_en-ZA.dat acor_$lang.dat
 done
+%if %{langpacks}
 af_ZA_aliases="af-NA"
 for lang in $af_ZA_aliases; do
         ln -sf acor_af-ZA.dat acor_$lang.dat
@@ -2100,10 +2103,15 @@ sv_SE_aliases="sv-FI"
 for lang in $sv_SE_aliases; do
         ln -s acor_sv-SE.dat acor_$lang.dat
 done
+%else
+rm -f acor_[a-df-z]*.dat acor_e[su]*.dat
+%endif
 popd
 #rhbz#484055 make these shared across multiple applications
 mv -f $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr $RPM_BUILD_ROOT/%{_datadir}/autocorr
 
+%if %{langpacks}
+
 #auto generate the langpack file lists, format is...
 #langpack id, has help or not, autocorrection glob, script classification
 langpackdetails=\
@@ -2164,7 +2172,7 @@ while [ $i -lt ${#langpackdetails[@]} ];
      sed -e "s/LANG/$lang/g" langpacks/openoffice.org.langpack-ctl.template >> $lang.filelist
    fi
    if [ "$type" = "ctl" ]; then
-     rm $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_$lang.xcu
+     rm -f $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_$lang.xcu
    fi
    i=$[i+1]
 done
@@ -2172,6 +2180,8 @@ done
 #rhbz#452379 clump serbian translations together
 cat sh.filelist >> sr.filelist
 
+%endif
+
 #add in some templates
 tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
 tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
@@ -2286,10 +2296,12 @@ sed -i -e "s/LAUNCHER/soffice/g" $RPM_BU
 sed -i -e "s/BRAND/openoffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
 
+%if %{langpacks}
 cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/broffice.org
 sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
 sed -i -e "s/BRAND/broffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/broffice.org
+%endif
 
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
@@ -2356,10 +2368,12 @@ sed -i -e s/openofficeorg$PRODUCTVERSION
   ./mime-info/openoffice.org.keys
 sed -i -e s/openoffice.org$PRODUCTVERSIONSHORT/openoffice.org/g \
   ./mime-info/openoffice.org.keys
+%if %{langpacks}
 sed -i -e s/brofficeorg$PRODUCTVERSIONSHORT/brofficeorg/g \
   ./mime-info/broffice.org.keys
 sed -i -e s/broffice.org$PRODUCTVERSIONSHORT/broffice.org/g \
   ./mime-info/broffice.org.keys
+%endif
 #relocate the rest of them
 cp -r icons $RPM_BUILD_ROOT/%{_datadir}
 cp -r mime-info $RPM_BUILD_ROOT/%{_datadir}
@@ -3168,6 +3182,7 @@ update-desktop-database %{_datadir}/appl
 %postun brand
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-brand
 %dir %{brinstdir}
 %doc %{brinstdir}/LICENSE
@@ -3227,6 +3242,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/icons/*/*/*/broffice*
 #launchers
 %{_bindir}/broffice.org
+%endif
 
 %post -n broffice.org-brand
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3310,6 +3326,7 @@ update-desktop-database %{_datadir}/appl
 %postun base
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-base
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3317,6 +3334,7 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/sbase
 %{_datadir}/applications/broffice.org-base.desktop
 %{_datadir}/mimelnk/application/broffice.org-*database*
+%endif
 
 %post -n broffice.org-base
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3598,6 +3616,7 @@ update-desktop-database %{_datadir}/appl
 %postun calc
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-calc
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3607,6 +3626,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/applications/broffice.org-calc.desktop
 %{_datadir}/mimelnk/application/broffice.org-ms-excel*
 %{_datadir}/mimelnk/application/broffice.org-*spreadsheet*
+%endif
 
 %post -n broffice.org-calc
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3663,6 +3683,7 @@ update-desktop-database %{_datadir}/appl
 %postun draw
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-draw
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3671,6 +3692,7 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/sdraw.bin
 %{_datadir}/applications/broffice.org-draw.desktop
 %{_datadir}/mimelnk/application/broffice.org-*drawing*
+%endif
 
 %post -n broffice.org-draw
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3776,6 +3798,7 @@ update-desktop-database %{_datadir}/appl
 %postun writer
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-writer
 %defattr(-,root,root,-)
 %{brinstdir}/program/swriter
@@ -3786,6 +3809,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/mimelnk/application/broffice.org-*master*
 %{_datadir}/mimelnk/application/broffice.org-*text*
 %{_datadir}/mimelnk/application/broffice.org-*web*
+%endif
 
 %post -n broffice.org-writer
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3853,6 +3877,7 @@ update-desktop-database %{_datadir}/appl
 %postun impress
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-impress
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3862,6 +3887,7 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/applications/broffice.org-impress.desktop
 %{_datadir}/mimelnk/application/broffice.org-*presentation*
 %{_datadir}/mimelnk/application/broffice.org-ms-powerpoint-template*.desktop
+%endif
 
 %post -n broffice.org-impress
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -3927,6 +3953,7 @@ update-desktop-database %{_datadir}/appl
 %postun math
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+%if %{langpacks}
 %files -n broffice.org-math
 %defattr(-,root,root,-)
 %dir %{brinstdir}
@@ -3934,6 +3961,7 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/smath
 %{_datadir}/applications/broffice.org-math.desktop
 %{_datadir}/mimelnk/application/broffice.org-*formula*
+%endif
 
 %post -n broffice.org-math
 update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -4087,6 +4115,8 @@ update-desktop-database %{_datadir}/appl
 %dir %{_datadir}/autocorr
 %{_datadir}/autocorr/acor_en-*
 
+%if %{langpacks}
+
 %files -n autocorr-af
 %dir %{_datadir}/autocorr
 %{_datadir}/autocorr/acor_af-*
@@ -4191,6 +4221,8 @@ update-desktop-database %{_datadir}/appl
 %dir %{_datadir}/autocorr
 %{_datadir}/autocorr/acor_zh-*
 
+%endif
+
 %pre pyuno
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
@@ -4212,6 +4244,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 11 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.7-UNBUILT
+- make oo.o buildable without langpacks again
+
 * Tue Sep 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.6
 - Resolves: ooo#104484 workspace.dr69.patch
 - Resolves: rhbz#521460 - wrong page size for A3/A5


