rpms/xulrunner/F-12 xulrunner.spec,1.180,1.181

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3132

Modified Files:
	xulrunner.spec 
Log Message:
Added fix for #480989


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/xulrunner.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- xulrunner.spec	16 Dec 2009 13:05:42 -0000	1.180
+++ xulrunner.spec	7 Jan 2010 10:54:26 -0000	1.181
@@ -9,10 +9,13 @@
 %define version_internal  1.9.1
 %define mozappdir         %{_libdir}/%{name}-%{version_internal}
 
+# The actual sqlite version (see #480989):
+%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
+
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -68,7 +71,7 @@ BuildRequires:  autoconf213
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
-Requires:       sqlite >= %{sqlite_version}
+Requires:       sqlite >= %{sqlite_build_version}
 Provides:       gecko-libs = %{version}
 
 %description
@@ -168,6 +171,15 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 #---------------------------------------------------------------------
 
 %build
+# Do not proceed with build if the sqlite require would be broken:
+# make sure the minimum requirement is non-empty, ...
+sqlite_version=$(expr "%{sqlite_version}" : '\([0-9]*\.\)[0-9]*\.') || exit 1
+# ... and that major number of the computed build-time version matches:
+case "%{sqlite_build_version}" in
+  "$sqlite_version"*) ;;
+  *) exit 1 ;;
+esac
+
 cd %{tarballdir}
 
 INTERNAL_GECKO=%{version_internal}
@@ -455,6 +467,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jan 7 2010 Martin Stransky <stransky at redhat.com> - 1.9.1.6-2
+- Added fix for #480989
+
 * Wed Dec 16 2009 Jan Horak <jhorak at redhat.com> - 1.9.1.6-1
 - Update to 1.9.1.6