[spice-xpi/f16] fix xpidl build error

Peter Hatina phatina at fedoraproject.org
Mon Feb 20 12:41:20 UTC 2012


commit 3982d0f43a29d357691d0d277a903d67349ad2fa
Author: Peter Hatina <phatina at redhat.com>
Date:   Mon Feb 20 13:36:26 2012 +0100

    fix xpidl build error

 spice-xpi-01-build-cachedir.patch |   40 +++++++++++++++++++++++++++++++++++++
 spice-xpi.spec                    |    8 ++++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/spice-xpi-01-build-cachedir.patch b/spice-xpi-01-build-cachedir.patch
new file mode 100644
index 0000000..f6bbce7
--- /dev/null
+++ b/spice-xpi-01-build-cachedir.patch
@@ -0,0 +1,40 @@
+From 7cd07c2e6426087d4c4d36c74083335098c5d0c1 Mon Sep 17 00:00:00 2001
+From: Peter Hatina <phatina at redhat.com>
+Date: Mon, 6 Feb 2012 17:32:57 +0100
+Subject: [PATCH] build: added cachedir option to typelib.py
+
+---
+ SpiceXPI/src/plugin/Makefile.am |   11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/SpiceXPI/src/plugin/Makefile.am b/SpiceXPI/src/plugin/Makefile.am
+index b2c83ab..a17ac4d 100644
+--- a/SpiceXPI/src/plugin/Makefile.am
++++ b/SpiceXPI/src/plugin/Makefile.am
+@@ -70,10 +70,10 @@ nsISpicec.xpt: nsISpicec.idl
+ 	$(XPIDL) -m typelib -I $(SDK_INCLUDE_DIR) $<
+ else
+ nsISpicec.h: nsISpicec.idl
+-	$(PYTHON) `pkg-config --variable=sdkdir libxul`/sdk/bin/header.py -I $(SDK_INCLUDE_DIR) $< -o $@
++	$(PYTHON) `pkg-config --variable=sdkdir libxul`/sdk/bin/header.py --cachedir . -I $(SDK_INCLUDE_DIR) $< -o $@
+ 
+ nsISpicec.xpt: nsISpicec.idl
+-	$(PYTHON) `pkg-config --variable=sdkdir libxul`/sdk/bin/typelib.py -I $(SDK_INCLUDE_DIR) $< -o $@
++	$(PYTHON) `pkg-config --variable=sdkdir libxul`/sdk/bin/typelib.py --cachedir . -I $(SDK_INCLUDE_DIR) $< -o $@
+ endif
+ 
+ BUILT_SOURCES =					\
+@@ -83,3 +83,10 @@ BUILT_SOURCES =					\
+ 
+ distclean-local:
+ 	rm -f $(BUILT_SOURCES)
++
++CLEANFILES = \
++	xpidllex.py   \
++	xpidllex.pyc  \
++	xpidlyacc.py  \
++	xpidlyacc.pyc \
++	xpidl_debug
+-- 
+1.7.7.6
+
diff --git a/spice-xpi.spec b/spice-xpi.spec
index e8de266..a29eeb3 100644
--- a/spice-xpi.spec
+++ b/spice-xpi.spec
@@ -1,11 +1,12 @@
 Name:           spice-xpi
 Version:        2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SPICE extension for Mozilla
 Group:          Applications/Internet
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://spice-space.org
 Source0:        http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
+Patch0:         spice-xpi-01-build-cachedir.patch
 
 BuildRequires:  log4cpp-devel
 BuildRequires:  xulrunner-devel >= 8.0
@@ -21,9 +22,11 @@ Spice extension for Mozilla allows the client to be used from a web browser.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 
+autoreconf
 %configure
 make %{?_smp_mflags}
 
@@ -40,6 +43,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %exclude %{_libdir}/mozilla/plugins/*.la
 
 %changelog
+* Mon Feb 20 2012 Peter Hatina <phatina at redhat.com> 2.7-2
+- Fixed build issue
+
 * Mon Jan 30 2012 Peter Hatina <phatina at redhat.com> 2.7-1
 - Update to 2.7
 


More information about the scm-commits mailing list