packages: mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec - up...

[glen]

Author: glen                         Date: Fri Mar 30 19:10:57 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.6.1, supports XUL 10.*; there's maintainer now

---- Files affected:
packages/mozilla-addon-gnome-keyring:
   mozilla-addon-gnome-keyring.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec
diff -u packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec:1.3 packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec:1.4
--- packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec:1.3	Sat Aug 27 16:03:45 2011
+++ packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec	Fri Mar 30 21:10:52 2012
@@ -2,25 +2,33 @@
 %define		extension gnome-keyring
 Summary:	Extension that enables Gnome Keyring integration
 Name:		mozilla-addon-%{extension}
-Version:	0.5.1.1
-Release:	0.1
+Version:	0.6.1
+Release:	1
 License:	GPL
 Group:		X11/Applications/Networking
-Source0:	https://github.com/mdlavin/firefox-gnome-keyring/tarball/master#/%{name}-%{version}.tgz
-# Source0-md5:	18335895a18ea14a2c221559ed848018
-URL:		https://github.com/mdlavin/firefox-gnome-keyring
+Source0:	https://github.com/infinity0/mozilla-gnome-keyring/tarball/%{version}/%{name}-%{version}.tgz
+# Source0-md5:	9c7ddba8fcf6775542ad7c7d3945a28d
+URL:		https://github.com/infinity0/mozilla-gnome-keyring/
 BuildRequires:	libgnome-keyring-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkg-config
-BuildRequires:	zip
 BuildRequires:	xulrunner-devel
+BuildRequires:	zip
 ExclusiveArch:	%{x8664} %{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # this comes from install.rdf
 %define		extension_id	\{6f9d85e0-794d-11dd-ad8b-0800200c9a66\}
 %define		extensionsdir	%{_libdir}/mozilla/extensions
-%define		platform		%(gcc --version --verbose 2>&1 | grep 'Target:' | cut '-d ' -f2)
+
+# https://developer.mozilla.org/en/XPCOM_ABI#ABI_Naming
+%define		platform		unknown
+%ifarch %{ix86}
+%define		platform		Linux_x86-gcc3
+%endif
+%ifarch %{x8664}
+%define		platform		Linux_x86_64-gcc3
+%endif
 
 %description
 This extension replaces the default password manager in both Firefox
@@ -34,12 +42,17 @@
 %setup -qc
 mv *-gnome-keyring-*/* .
 
+%{__sed} -i -e '/^CXXFLAGS/ s/$/ $(OPTFLAGS)/' Makefile
+
 %build
 # build ext for current arch only
 %{__make} build-xpi \
+	PLATFORM=%{platform} \
 	VERSION=%{version} \
+	XUL_VER_MIN=10.0.1 \
+	XUL_VER_MAX=10.* \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcxxflags}"
+	OPTFLAGS="%{rpmcxxflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2012/03/30 19:10:52  glen
+- up to 0.6.1, supports XUL 10.*; there's maintainer now
+
 Revision 1.3  2011/08/27 14:03:45  glen
 - update from git, not sure what version is, so let's call it 0.5.1.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec?r1=1.3&r2=1.4