rpms/openoffice.org/devel openoffice.org.spec,1.1486,1.1487

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
themes centralized


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1486
retrieving revision 1.1487
diff -u -r1.1486 -r1.1487
--- openoffice.org.spec	23 Apr 2008 08:47:09 -0000	1.1486
+++ openoffice.org.spec	23 Apr 2008 09:20:44 -0000	1.1487
@@ -1638,18 +1638,6 @@
 #remove dummy .dat files
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/root?.dat
 
-#remove ancient icons in favour of tango
-pushd $RPM_BUILD_ROOT/%{oooinstdir}/share/config/
-rm -f images_industrial.zip
-ln -sf images_tango.zip images.zip
-popd
-%if %{langpacks}
-pushd $RPM_BUILD_ROOT/%{brinstdir}/share/config/
-rm -f images_industrial.zip
-ln -sf images_tango.zip images.zip
-popd
-%endif
-
 #set standard permissions for rpmlint
 find $RPM_BUILD_ROOT/%{baseinstdir} $RPM_BUILD_ROOT/%{basisinstdir} $RPM_BUILD_ROOT/%{oooinstdir} -exec chmod +w {} \;
 %if %{langpacks}
@@ -2242,6 +2230,12 @@
 %{basisinstdir}/share/autotext
 %{basisinstdir}/share/basic
 %dir %{basisinstdir}/share/config
+%{basisinstdir}/share/config/images.zip
+%{basisinstdir}/share/config/images_classic8.zip
+%{basisinstdir}/share/config/images_crystal.zip
+%{basisinstdir}/share/config/images_hicontrast.zip
+%{basisinstdir}/share/config/images_industrial.zip
+%{basisinstdir}/share/config/images_tango.zip
 %{basisinstdir}/share/config/javasettingsunopkginstall.xml
 %{basisinstdir}/share/config/psetup.xpm
 %{basisinstdir}/share/config/psetupl.xpm
@@ -2565,10 +2559,7 @@
 %{oooinstdir}/program/versionrc
 %dir %{oooinstdir}/share
 %dir %{oooinstdir}/share/config
-%{oooinstdir}/share/config/images.zip
-%{oooinstdir}/share/config/images_crystal.zip
-%{oooinstdir}/share/config/images_hicontrast.zip
-%{oooinstdir}/share/config/images_tango.zip
+%{oooinstdir}/share/config/images_brand.zip
 %dir %{oooinstdir}/share/readme
 %{oooinstdir}/share/readme/LICENSE_en-US
 %{oooinstdir}/share/readme/LICENSE_en-US.html
@@ -2624,10 +2615,7 @@
 %{brinstdir}/program/versionrc
 %dir %{brinstdir}/share
 %dir %{brinstdir}/share/config
-%{brinstdir}/share/config/images.zip
-%{brinstdir}/share/config/images_crystal.zip
-%{brinstdir}/share/config/images_hicontrast.zip
-%{brinstdir}/share/config/images_tango.zip
+%{brinstdir}/share/config/images_brand.zip
 %dir %{brinstdir}/share/readme
 %{brinstdir}/share/readme/LICENSE_pt-BR
 %{brinstdir}/share/readme/LICENSE_pt-BR.html