[Spice-commits] SpiceXPI/Makefile.am SpiceXPI/src

[Peter Hatina]

 SpiceXPI/Makefile.am     |   18 ++++--------------
 SpiceXPI/src/install.rdf |    7 ++++---
 2 files changed, 8 insertions(+), 17 deletions(-)

New commits:
commit 7d747cae9cc7f2ab6bd137282b70a171e4034c4e
Author: Peter Hatina <phatina at redhat.com>
Date:   Wed Nov 23 17:43:43 2011 +0100

    fix SpiceXPI.xpi manual installation

diff --git a/SpiceXPI/Makefile.am b/SpiceXPI/Makefile.am
index e258b75..9f0ad0b 100644
--- a/SpiceXPI/Makefile.am
+++ b/SpiceXPI/Makefile.am
@@ -14,27 +14,17 @@ logger.ini :
 DISTDIR=dist
 ZIP=zip
 
-# FIXME: we are actually using gcc 4
-if X86_64
-PLATFORM=Linux_x86_64-gcc3
-else
-PLATFORM=Linux_x86-gcc3
-endif
-
 all-local: SpiceXPI.xpi
 
 CLEANFILES = SpiceXPI.xpi
 
 SpiceXPI.xpi: $(top_builddir)/SpiceXPI/src/install.rdf $(top_builddir)/SpiceXPI/src/plugin/nsISpicec.xpt $(top_builddir)/SpiceXPI/src/plugin/.libs/libnsISpicec.so
 	rm -rf dist
-	@[ -d $(DISTDIR)/platform ] || mkdir -p $(DISTDIR)/platform
+	@[ -d $(DISTDIR)/plugins ] || mkdir -p $(DISTDIR)/plugins
 	cp $(top_srcdir)/SpiceXPI/src/install.rdf $(DISTDIR)
-#	cp $(XPT) src/*.js $(DISTDIR)/components
-	@[ -d $(DISTDIR)/platform/$(PLATFORM) ] || mkdir -p $(DISTDIR)/platform/$(PLATFORM)
-	@[ -d $(DISTDIR)/platform/$(PLATFORM)/plugins ] || mkdir -p $(DISTDIR)/platform/$(PLATFORM)/plugins
-	cp $(top_srcdir)/SpiceXPI/src/plugin/*.xpt $(DISTDIR)/platform/$(PLATFORM)/plugins
-	cp $(top_builddir)/SpiceXPI/src/plugin/.libs/libnsISpicec.so* $(DISTDIR)/platform/$(PLATFORM)/plugins/nsISpicec.so
-	cp $(top_srcdir)/SpiceXPI/logger.ini $(DISTDIR)/platform/$(PLATFORM)/logger.ini
+	cp $(top_srcdir)/SpiceXPI/src/plugin/*.xpt $(DISTDIR)/plugins
+	cp $(top_builddir)/SpiceXPI/src/plugin/.libs/libnsISpicec.so* $(DISTDIR)/plugins/nsISpicec.so
+	cp $(top_srcdir)/SpiceXPI/logger.ini $(DISTDIR)/plugins/logger.ini
 	(cd $(DISTDIR); $(ZIP) -r ../$(XPI) .)
 
 distclean-local:
diff --git a/SpiceXPI/src/install.rdf b/SpiceXPI/src/install.rdf
index 02bbcb5..d916372 100644
--- a/SpiceXPI/src/install.rdf
+++ b/SpiceXPI/src/install.rdf
@@ -10,8 +10,8 @@
       <!-- Firefox -->
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>1.0+</em:minVersion>
-        <em:maxVersion>8.0+</em:maxVersion>
+        <em:minVersion>4.0</em:minVersion>
+        <em:maxVersion>10.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 	
@@ -20,5 +20,6 @@
     <em:description>Spice client wrapper</em:description>
     <em:creator>redhat.com</em:creator>
     <em:homepageURL>http://www.redhat.com</em:homepageURL>
+    <em:unpack>true</em:unpack>
   </Description>
-RDF>
+</RDF>