Attachment 4298 Details for Bug 11023 – Patch to gnome-keyring.spec to enable multiarch-dispatch support.

[patch] Patch to gnome-keyring.spec to enable multiarch-dispatch support.

gnome-keyring-multiarch.patch (text/plain), 1.64 KB, created by Patrick Hibbs on 2013-08-30 17:31:04 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Hibbs

Created: 2013-08-30 17:31:04 CEST

Size: 1.64 KB

patch

obsolete

>--- gnome-keyring.spec	2013-08-30 10:09:04.000000000 -0400
>+++ gnome-keyring.spec.new	2013-08-30 10:08:39.000000000 -0400
>@@ -1,3 +1,6 @@
>+# Local macro to locate multiarch-dispatch.
>+%define ma_dispatch %(which multiarch-dispatch)
>+
> %define api	3
> 
> %define url_ver	%(echo %{version}|cut -d. -f1,2)
>@@ -5,7 +8,7 @@
> Summary:	Keyring and password manager for the GNOME desktop
> Name:		gnome-keyring
> Version:	3.6.3
>-Release:	%mkrel 1
>+Release:	%mkrel 2
> Source0:	http://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
> URL:		http://www.gnome.org/
> License:	GPLv2+ and LGPLv2+
>@@ -44,6 +47,14 @@
> %install
> %makeinstall_std
> 
>+# Multiarch support.
>+%multiarch_binaries %{buildroot}%{_bindir}/%{name}-%{api}
>+%multiarch_binaries %{buildroot}%{_bindir}/%{name}-daemon
>+# Hack to fix installed symlink.
>+ln -s %{multiarch_bindir}/%{name}-%{api} %{buildroot}%{multiarch_bindir}/%{name}
>+rm -rf %{buildroot}%{_bindir}/%{name}
>+ln -s %{ma_dispatch} %{buildroot}%{_bindir}/%{name}
>+
> #we don't want these
> find %{buildroot} -name "*.la" -delete
> 
>@@ -58,7 +69,10 @@
> %{_sysconfdir}/pkcs11/modules/%{name}.module
> %{_bindir}/%{name}
> %{_bindir}/%{name}-%{api}
>-%attr(755,root,root) %{_bindir}/%{name}-daemon
>+%{_bindir}/%{name}-daemon
>+%multiarch %{multiarch_bindir}/%{name}
>+%multiarch %{multiarch_bindir}/%{name}-%{api}
>+%attr(755,root,root) %multiarch %{multiarch_bindir}/%{name}-daemon
> %{_libdir}/%{name}
> %{_libdir}/pkcs11
> /%{_lib}/security/pam_gnome_keyring*.so
>@@ -69,6 +83,8 @@
> 
> 
> %changelog
>+* Thu Aug 29 2013 codebase7 <codebase7@yahoo.com> 3.6.3-2.mga3
>+- Include multiarch support
> 
> * Sat Mar 02 2013 wally <wally> 3.6.3-1.mga3
> + Revision: 400984

--- gnome-keyring.spec	2013-08-30 10:09:04.000000000 -0400
+++ gnome-keyring.spec.new	2013-08-30 10:08:39.000000000 -0400
@@ -1,3 +1,6 @@
+# Local macro to locate multiarch-dispatch.
+%define ma_dispatch %(which multiarch-dispatch)
+
 %define api	3
 
 %define url_ver	%(echo %{version}|cut -d. -f1,2)
@@ -5,7 +8,7 @@
 Summary:	Keyring and password manager for the GNOME desktop
 Name:		gnome-keyring
 Version:	3.6.3
-Release:	%mkrel 1
+Release:	%mkrel 2
 Source0:	http://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
 URL:		http://www.gnome.org/
 License:	GPLv2+ and LGPLv2+
@@ -44,6 +47,14 @@
 %install
 %makeinstall_std
 
+# Multiarch support.
+%multiarch_binaries %{buildroot}%{_bindir}/%{name}-%{api}
+%multiarch_binaries %{buildroot}%{_bindir}/%{name}-daemon
+# Hack to fix installed symlink.
+ln -s %{multiarch_bindir}/%{name}-%{api} %{buildroot}%{multiarch_bindir}/%{name}
+rm -rf %{buildroot}%{_bindir}/%{name}
+ln -s %{ma_dispatch} %{buildroot}%{_bindir}/%{name}
+
 #we don't want these
 find %{buildroot} -name "*.la" -delete
 
@@ -58,7 +69,10 @@
 %{_sysconfdir}/pkcs11/modules/%{name}.module
 %{_bindir}/%{name}
 %{_bindir}/%{name}-%{api}
-%attr(755,root,root) %{_bindir}/%{name}-daemon
+%{_bindir}/%{name}-daemon
+%multiarch %{multiarch_bindir}/%{name}
+%multiarch %{multiarch_bindir}/%{name}-%{api}
+%attr(755,root,root) %multiarch %{multiarch_bindir}/%{name}-daemon
 %{_libdir}/%{name}
 %{_libdir}/pkcs11
 /%{_lib}/security/pam_gnome_keyring*.so
@@ -69,6 +83,8 @@
 
 
 %changelog
+* Thu Aug 29 2013 codebase7 <codebase7@yahoo.com> 3.6.3-2.mga3
+- Include multiarch support
 
 * Sat Mar 02 2013 wally <wally> 3.6.3-1.mga3
 + Revision: 400984

Actions: View | Diff

Attachments on bug 11023: 4298