From bbbc51e931c3a7018f2f19f61fa823190ee6fbb1 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 24 Sep 2013 01:49:59 +0300
Subject: Create a proper Info.plist for the OS X app bundle already in
 configure

After recent instdir changes the SCPZIP_REPLACE thing was not used any
more for Info.plist, so all the ${FOO} things were left in Info.plist
unexpanded with predictably wonky results, a non-working app.

Instead just expand it from the configure script.

While at it, use a correct CFBundleShortVersionString: only three
integers should be in that.

Also, hardcode FILEFORMATNAME as OpenOffice.org and FILEFORMATVERSION
as 1.0, and drop the "variables", as that is what those "variables"
*means*. They were used to refer to the OOo 1.0 formats. (It would
have been utterly wrong to define them as something else, like another
product name and a newer version number, in openoffice.lst, so
pointless to have them there.)

Drop the meaningless BUILDIDCWS.

Change-Id: I4030aa060b78e8b3fb812a6362869996e8db7d3d
---
 officecfg/registry/data/org/openoffice/Setup.xcu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 50bdb2192c6b..75649f0405c2 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -38,10 +38,10 @@
       <value>${PRODUCTEXTENSION}</value>
     </prop>
     <prop oor:name="ooXMLFileFormatVersion">
-      <value>${FILEFORMATVERSION}</value>
+      <value>1.0</value>
     </prop>
     <prop oor:name="ooXMLFileFormatName">
-      <value>${FILEFORMATNAME}</value>
+      <value>OpenOffice.org</value>
     </prop>
     <prop oor:name="ooOpenSourceContext">
       <value>1</value>
-- 
cgit