From 1487861cc650ecd09e74a7a9df394fd38fb488790950c59bf4e9fcf7add74348 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 15 Sep 2011 10:23:14 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/kbd revision 52.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=fd828285ae7759ac91c8cb3bf33ad105 --- kbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kbd.spec b/kbd.spec index 92f67d2..ef36586 100644 --- a/kbd.spec +++ b/kbd.spec @@ -24,7 +24,7 @@ License: GPLv2+ Group: System/Console AutoReqProv: on Version: 1.15.3 -Release: 0 +Release: 1 Summary: Keyboard and Font Utilities %if 0 Source: kbd-%{version}.tar.bz2 From a9e024bc914e064cd05f05b7a92fe11f105106ddff87c7fbf1de1a47444e560d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 4 Oct 2011 08:34:21 +0000 Subject: [PATCH 2/2] Accepting request 86405 from home:uli_suse:branches:Base:System - cross-build fix: use %__cc, %configure macros - configure: explicitly set bindir OBS-URL: https://build.opensuse.org/request/show/86405 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=33 --- kbd.changes | 6 ++++++ kbd.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kbd.changes b/kbd.changes index 285d68a..17d27b3 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 30 15:28:41 UTC 2011 - uli@suse.com + +- cross-build fix: use %__cc, %configure macros +- configure: explicitly set bindir + ------------------------------------------------------------------- Wed Sep 14 15:58:43 CEST 2011 - sbrabec@suse.cz diff --git a/kbd.spec b/kbd.spec index ef36586..7ce6026 100644 --- a/kbd.spec +++ b/kbd.spec @@ -101,15 +101,16 @@ pushd data/keymaps/i386 # bnc#435121 test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map popd -./configure \ +%configure \ --prefix=/ \ --datadir=%{kbd} \ --mandir=%{_mandir} \ + --bindir=/bin \ --enable-nls \ --localedir=/usr/share/locale \ --enable-optional-progs make CFLAGS="$RPM_OPT_FLAGS -Os" -gcc $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c +%{__cc} $RPM_OPT_FLAGS -o fbtest $RPM_SOURCE_DIR/fbtest.c # fix lat2-16.psfu (bnc#340579) font=data/consolefonts/lat2a-16.psfu ./src/psfxtable -i $font -it data/unimaps/lat2u.uni \