commit 5edc5411136df2f84479564d7ded1f9e101f7154
Author: Elan Ruusamäe <[email protected]>
Date: Wed Feb 20 20:48:16 2013 +0200
do not build xpcom_abi if not needed
make.patch | 17 +++++++++++++++++
mozilla-addon-gnome-keyring.spec | 2 ++
2 files changed, 19 insertions(+)
---
diff --git a/mozilla-addon-gnome-keyring.spec b/mozilla-addon-gnome-keyring.spec
index 8793460..8bca547 100644
--- a/mozilla-addon-gnome-keyring.spec
+++ b/mozilla-addon-gnome-keyring.spec
@@ -7,6 +7,7 @@ License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Networking
Source0:
https://github.com/infinity0/mozilla-gnome-keyring/archive/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: c69d2816e0543baec478ab9d57a38e43
+Patch0: make.patch
URL: https://github.com/infinity0/mozilla-gnome-keyring/
BuildRequires: libgnome-keyring-devel >= 3.4.0
BuildRequires: libstdc++-devel
@@ -40,6 +41,7 @@ password after Firefox or Thunderbird has been started.
%prep
%setup -qn mozilla-gnome-keyring-%{version}
+%patch0 -p1
%{__sed} -i -e '/^CXXFLAGS/ s/$/ $(OPTFLAGS)/' Makefile
diff --git a/make.patch b/make.patch
new file mode 100644
index 0000000..4a4dd6e
--- /dev/null
+++ b/make.patch
@@ -0,0 +1,17 @@
+--- mozilla-gnome-keyring-0.6.7/Makefile~ 2013-02-20 20:41:07.000000000
+0200
++++ mozilla-gnome-keyring-0.6.7/Makefile 2013-02-20 20:44:08.144362897
+0200
+@@ -63,12 +63,13 @@
+
+ build: build-xpi
+
+-build-xpi: xpcom_abi
+ ifeq "$(PLATFORM)" "unknown"
++build-xpi: xpcom_abi
+ # set PLATFORM properly in a sub-make
+ PLATFORM=$$(./xpcom_abi) && \
+ $(MAKE) -f $(lastword $(MAKEFILE_LIST)) $(XPI_TARGET)
PLATFORM=$${PLATFORM}
+ else
++build-xpi:
+ $(MAKE) -f $(lastword $(MAKEFILE_LIST)) $(XPI_TARGET)
+ endif
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mozilla-addon-gnome-keyring.git/commitdiff/5edc5411136df2f84479564d7ded1f9e101f7154
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
