rpms/openoffice.org/devel openoffice.org.spec,1.1268,1.1269

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
arrgh, forgot to add the neon library back into the filelist


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1268
retrieving revision 1.1269
diff -u -r1.1268 -r1.1269
--- openoffice.org.spec	23 Aug 2007 10:00:52 -0000	1.1268
+++ openoffice.org.spec	23 Aug 2007 12:40:21 -0000	1.1269
@@ -1166,6 +1166,9 @@
 
 %install
 source Linux*Env.Set.sh
+#figure out the icon version
+export LONGICON`grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
+export ICONPRODUCTVERSION=${LONGICONPRODUCTVERSION/./}
 unset HAVE_LD_HASH_STYLE
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
@@ -1444,6 +1447,10 @@
     sed -i -e '/^Name/d' $file
     sed -i -e 's/GenericName/Name/g' $file
 done
+# rhbz#156067 don't version the icons
+for file in *.desktop; do
+    sed -i -e s/$ICONPRODUCTVERSION//g $file
+done
 echo "StartupNotify=true" >> base.desktop
 echo "TryExec=oobase" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -1469,12 +1476,24 @@
 cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
 cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
 popd
-#get rid of the gnome icons
-rm -rf sysui/output/usr/share/icons/gnome
+pushd sysui/output/usr/share/
+#get rid of the gnome icons and other unneeded files
+rm -rf icons/gnome applications mime application-registry
+# rhbz#156067 don't version the icons
+find . -name "*.desktop" -exec sed -i -e s/$ICONPRODUCTVERSION//g {} \;
+find . -name "openofficeorg$ICONPRODUCTVERSION*" -exec bash -c \
+  "mv \$1 \`echo \$1 | sed s/officeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
+find . -name "openoffice.org$LONGICONPRODUCTVERSION*" -exec bash -c \
+  "mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
+sed -i -e s/openofficeorg$ICONPRODUCTVERSION/openofficeorg/g \
+  ./mime-info/openoffice.org.keys
+sed -i -e s/openoffice.org$LONGICONPRODUCTVERSION/openoffice.org/g \
+  ./mime-info/openoffice.org.keys
 #relocate the rest of them
-cp -r sysui/output/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/output/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/output/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
+cp -r icons $RPM_BUILD_ROOT/%{_datadir}
+cp -r mime-info $RPM_BUILD_ROOT/%{_datadir}
+cp -r mimelnk $RPM_BUILD_ROOT/%{_datadir}
+popd
 
 rm -rf $RPM_BUILD_ROOT/%{instdir}/readmes
 rm -rf $RPM_BUILD_ROOT/%{instdir}/licenses
@@ -1784,7 +1803,7 @@
 %{instdir}/program/libtvhlp1.so
 %{instdir}/program/libucbhelper4gcc3.so
 %{instdir}/program/libucpchelp1.so
-#neon disabled for now %{instdir}/program/libucpdav1.so
+%{instdir}/program/libucpdav1.so
 %{instdir}/program/libucpftp1.so
 %{instdir}/program/libucphier1.so
 %{instdir}/program/libucppkg1.so