rpms/nspluginwrapper/devel nspluginwrapper.spec,1.29,1.30

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8593

Modified Files:
	nspluginwrapper.spec 
Log Message:
spec fixes


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nspluginwrapper.spec	10 Dec 2007 12:25:07 -0000	1.29
+++ nspluginwrapper.spec	11 Dec 2007 10:18:57 -0000	1.30
@@ -1,18 +1,23 @@
+# Compile with XPCOM support?
+%define xpcom_support 		1
+
+# Compile as a debug package?
+%define make_debug_package 	0
+
+# What gecko we use?
+%define gecko_flavour 		"xulrunner"
+
 # To determine the current gecko-devel version:
 # rpm -q --provides firefox-devel | grep gecko-devel
 # NOTE: it's used only if the package is compiled with xpcom_support = 1
-%define gecko_ver 1.9
+%if %{xpcom_support}
+%define gecko_ver 		1.9
+%endif
 
 %define plugin_config_version 1.8
 %define plugin_config_name plugin-config-%{plugin_config_version}
 %define plugin_config_binary plugin-config
 
-# Compile with XPCOM support?
-%define xpcom_support 		1
-
-# Compile as a debug package?
-%define make_debug_package 	0
-
 # Excluded plugins
 %define exclude_list 		"libtotem-*"
 
@@ -88,10 +93,15 @@
 Provides:	%{name} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:	%{_bindir}/linux32 
-Requires:	gecko-libs = %{gecko_ver}
 BuildRequires:	pkgconfig gtk2-devel glib2
 BuildRequires:	libXt-devel cairo-devel
+%if %{xpcom_support}
+Requires:	gecko-libs = %{gecko_ver}
 BuildRequires:	gecko-devel = %{gecko_ver}
+%else
+Requires:	gecko-libs
+BuildRequires:	gecko-devel
+%endif
 ExclusiveArch:	i386 x86_64 ppc
 
 %description
@@ -160,7 +170,7 @@
 	    --with-xpcom="$XPCOM_SUPPORT"	\
 	    --with-base-libdir=%{libdir}	\
 	    --with-x11-prefix=/usr	        \
-	    --with-gecko=xulrunner
+	    --with-gecko=%{gecko_flavour}
 	    
 make
 popd
@@ -194,7 +204,9 @@
 
 rm -rf $RPM_BUILD_ROOT/usr/doc/plugin-config
 
-GECKO_VERSION=`pkg-config --modversion xulrunner-plugin`
+%if %{xpcom_support}
+GECKO_VERSION=`pkg-config --modversion %{gecko_flavour}-plugin`
+%endif
 
 cat %{SOURCE2} | %{__sed} -e "s|FIREFOX_VERSION|$GECKO_VERSION|g" \
                           -e "s|USE_XPCOM|%{xpcom_support}|g" 	  \
@@ -233,6 +245,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Tue Dec 11 2007 Martin Stransky <stransky at redhat.com>
+- spec fixes
+
 * Mon Dec 10 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-15
 - updated configure script - gecko selection