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

[glen]

Author: glen                         Date: Sat Aug 27 14:03:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update from git, not sure what version is, so let's call it 0.5.1.1

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

---- 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.2 packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec:1.3
--- packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec:1.2	Wed Jul 13 13:24:44 2011
+++ packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec	Sat Aug 27 16:03:45 2011
@@ -2,12 +2,12 @@
 %define		extension gnome-keyring
 Summary:	Extension that enables Gnome Keyring integration
 Name:		mozilla-addon-%{extension}
-Version:	0.5.1
-Release:	0.2
+Version:	0.5.1.1
+Release:	0.1
 License:	GPL
 Group:		X11/Applications/Networking
 Source0:	https://github.com/mdlavin/firefox-gnome-keyring/tarball/master#/%{name}-%{version}.tgz
-# Source0-md5:	148bf938edeaa641aa5b6c7f70bbf599
+# Source0-md5:	18335895a18ea14a2c221559ed848018
 URL:		https://github.com/mdlavin/firefox-gnome-keyring
 BuildRequires:	libgnome-keyring-devel
 BuildRequires:	libstdc++-devel
@@ -20,12 +20,7 @@
 # this comes from install.rdf
 %define		extension_id	\{6f9d85e0-794d-11dd-ad8b-0800200c9a66\}
 %define		extensionsdir	%{_libdir}/mozilla/extensions
-%ifarch %{ix86}
-%define		arch	x86
-%endif
-%ifarch %{x8664}
-%define		arch	x86_64
-%endif
+%define		platform		%(gcc --version --verbose 2>&1 | grep 'Target:' | cut '-d ' -f2)
 
 %description
 This extension replaces the default password manager in both Firefox
@@ -39,21 +34,12 @@
 %setup -qc
 mv *-gnome-keyring-*/* .
 
-rm -vf *.xpi
-rm -rf lib
-
-# remove dep to build both arch
-sed -i -e ' /^build-xpi:/s,build-library-.*,,' Makefile
-
-grep 'VERSION.*= %{version}' Makefile
-
 %build
 # build ext for current arch only
-%{__make} build-library-%{arch} \
+%{__make} build-xpi \
+	VERSION=%{version} \
 	CXX="%{__cxx}" \
 	CXXFLAGS="%{rpmcxxflags}"
-# this one will subst version in install.rdf
-%{__make} build-xpi
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,9 +56,9 @@
 %{extensionsdir}/%{extension_id}/chrome.manifest
 %{extensionsdir}/%{extension_id}/install.rdf
 %dir %{extensionsdir}/%{extension_id}/platform
-%dir %{extensionsdir}/%{extension_id}/platform/Linux_*-gcc3
-%dir %{extensionsdir}/%{extension_id}/platform/Linux_*-gcc3/components
-%attr(755,root,root) %{extensionsdir}/%{extension_id}/platform/Linux_*-gcc3/components/libgnomekeyring.so
+%dir %{extensionsdir}/%{extension_id}/platform/%{platform}
+%dir %{extensionsdir}/%{extension_id}/platform/%{platform}/components
+%attr(755,root,root) %{extensionsdir}/%{extension_id}/platform/%{platform}/components/libgnomekeyring.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -80,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+
 Revision 1.2  2011/07/13 11:24:44  glen
 - missing dir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-addon-gnome-keyring/mozilla-addon-gnome-keyring.spec?r1=1.2&r2=1.3&f=u