[packages/xorg-data-xbitmaps] build noarch

glen glen at pld-linux.org
Thu Apr 14 08:09:16 CEST 2016


commit 375fe593bd5070473bfc86f679dc734e46eb656f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Apr 14 09:08:47 2016 +0300

    build noarch

 noarch.patch            | 14 ++++++++++++++
 xorg-data-xbitmaps.spec | 17 +++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/xorg-data-xbitmaps.spec b/xorg-data-xbitmaps.spec
index c3fcc06..7eda1c1 100644
--- a/xorg-data-xbitmaps.spec
+++ b/xorg-data-xbitmaps.spec
@@ -2,19 +2,27 @@ Summary:	Bitmaps that are shared between X applications
 Summary(pl.UTF-8):	Bitmapy współdzielone między aplikacjami X
 Name:		xorg-data-xbitmaps
 Version:	1.1.1
-Release:	2
+Release:	3
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/data/xbitmaps-%{version}.tar.bz2
 # Source0-md5:	7444bbbd999b53bec6a60608a5301f4c
+Patch0:		noarch.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 BuildRequires:	rpmbuild(macros) >= 1.446
 BuildRequires:	xorg-util-util-macros >= 1.3
 Requires:	filesystem >= 3.0-32
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{_host_cpu} == "x32"
+%define	build_arch %{_target_platform}
+%else
+%define	build_arch %{_host}
+%endif
+
 %description
 Bitmaps that are shared between X applications.
 
@@ -29,13 +37,14 @@ Bitmapy współdzielone między aplikacjami X.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
-
+%configure \
+	--host=%{build_arch} \
+	--build=%{build_arch} \
+	%{nil}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
diff --git a/noarch.patch b/noarch.patch
new file mode 100644
index 0000000..435a38b
--- /dev/null
+++ b/noarch.patch
@@ -0,0 +1,14 @@
+drop arch specific 'libdir=@libdir@'
+
+see ba8d08a029c82aeb60b8c24fad76de8be288022b
+https://lists.debian.org/debian-x/2011/01/msg00289.html
+
+--- xbitmaps-1.1.1/xbitmaps.pc.in~	2009-10-17 00:37:58.000000000 +0300
++++ xbitmaps-1.1.1/xbitmaps.pc.in	2016-04-14 09:04:58.386919332 +0300
+@@ -1,6 +1,5 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+ includedir=@includedir@
+ 
+ Name: X bitmaps
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-data-xbitmaps.git/commitdiff/375fe593bd5070473bfc86f679dc734e46eb656f



More information about the pld-cvs-commit mailing list