diff options
| author | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-03 18:09:01 +0000 |
|---|---|---|
| committer | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-03 18:09:01 +0000 |
| commit | 9ed273d6a4ec74879278973007e095a0b2b9ae44 (patch) | |
| tree | ef33cda25eb98de508d4eff8c34a33f6ffa68950 | |
| parent | 01dbce5bbd6ec0582358d681fd41bc01a9148180 (diff) | |
| download | multiarch-utils-9ed273d6a4ec74879278973007e095a0b2b9ae44.tar multiarch-utils-9ed273d6a4ec74879278973007e095a0b2b9ae44.tar.gz multiarch-utils-9ed273d6a4ec74879278973007e095a0b2b9ae44.tar.bz2 multiarch-utils-9ed273d6a4ec74879278973007e095a0b2b9ae44.tar.xz multiarch-utils-9ed273d6a4ec74879278973007e095a0b2b9ae44.zip | |
Synthesized commit during git-svn import combining previous Mandriva history with Mageia.1.0.13
This commit consitsts of the following subversion commits:
------------------------------------------------------------------------
r399 | dmorgan | 2011-02-03 18:09:01 +0000 (Thu, 03 Feb 2011) | 1 line
Import cleaned multiarch-utils*
------------------------------------------------------------------------
In addition to the above commits, the following cleaning work has been recorded:
- License is GPL according to the relevant rpm spec written by Mandriva (no explicit
COPYING or LICENSE files)
- '# Project: Mandriva Linux' in several files, removed
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | NEWS | 9 | ||||
| -rwxr-xr-x | check-multiarch-files | 3 | ||||
| -rw-r--r-- | macros.multiarch | 9 | ||||
| -rwxr-xr-x | mkmultiarch | 3 | ||||
| -rwxr-xr-x | multiarch-dispatch | 3 |
6 files changed, 17 insertions, 14 deletions
@@ -1,7 +1,7 @@ #--------------------------------------------------------------- # Package : multiarch-utils # File : Makefile -# Version : $Id$ +# Version : $Id: Makefile 265211 2010-01-24 12:53:25Z anssi $ # Author : Gwenole Beauchesne # Created On : Wed Jan 12 18:42:04 CET 2005 #--------------------------------------------------------------- @@ -18,7 +18,7 @@ OTHER_FILES = Makefile NEWS FILES = $(foreach file,$(RPM_MACRO_FILES),macros.$(file)) $(RPM_BIN_FILES) $(BINARIES) $(INCLUDES) $(OTHER_FILES) PACKAGE = multiarch-utils -VERSION = 1.0.10 +VERSION = 1.0.13 MULTIARCH_DIST = 1020 all: @@ -1,3 +1,12 @@ +Version 1.0.13 - 09 January 2011, by Olivier Blin +- fix other multiarch() macros by adding nil + +Version 1.0.12 - 08 January 2011, by Olivier Blin +- fix multiarch() macro + +Version 1.0.11 - 08 January 2011, by Olivier Blin +- remove obsole mdk macros + Version 1.0.10 - 24 January 2010, by Anssi Hannula - remove dispatch file for host.def, it is no longer used diff --git a/check-multiarch-files b/check-multiarch-files index 925be3b..c2cc514 100755 --- a/check-multiarch-files +++ b/check-multiarch-files @@ -1,9 +1,8 @@ #!/usr/bin/perl #--------------------------------------------------------------- -# Project : Mandriva Linux # Module : multiarch-utils # File : check-multiarch -# Version : $Id$ +# Version : $Id: check-multiarch-files 156134 2005-08-07 14:29:26Z gbeauchesne $ # Author : Gwenole Beauchesne # Created On : Mon Jan 24 18:02:21 CET 2005 #--------------------------------------------------------------- diff --git a/macros.multiarch b/macros.multiarch index 8cad465..2b43acf 100644 --- a/macros.multiarch +++ b/macros.multiarch @@ -7,16 +7,13 @@ %multiarch_distro %MULTIARCH_DISTRO% %multiarch_binaries() \ -%if %{mdkversion} >= %{multiarch_distro} \ %{_prefix}/lib/rpm/mkmultiarch binaries %* \ -%endif +%{nil} %multiarch_includes() \ -%if %{mdkversion} >= %{multiarch_distro} \ %{_prefix}/lib/rpm/mkmultiarch includes %* \ -%endif +%{nil} %multiarch() \ -%if %{mdkversion} >= %{multiarch_distro} \ %* \ -%endif +%{nil} diff --git a/mkmultiarch b/mkmultiarch index a4085a2..6c88358 100755 --- a/mkmultiarch +++ b/mkmultiarch @@ -1,9 +1,8 @@ #!/bin/bash #--------------------------------------------------------------- -# Project : Mandriva Linux # Module : multiarch-utils # File : mkmultiarch -# Version : $Id$ +# Version : $Id: mkmultiarch 156134 2005-08-07 14:29:26Z gbeauchesne $ # Author : Gwenole Beauchesne # Created On : Wed Jan 12 10:54:10 CET 2005 #--------------------------------------------------------------- diff --git a/multiarch-dispatch b/multiarch-dispatch index 61ce0bd..14ff01d 100755 --- a/multiarch-dispatch +++ b/multiarch-dispatch @@ -1,9 +1,8 @@ #!/bin/sh #--------------------------------------------------------------- -# Project : Mandriva Linux # Module : multiarch-utils # File : multiarch-dispatch -# Version : $Id$ +# Version : $Id: multiarch-dispatch 156136 2005-08-07 15:46:51Z gbeauchesne $ # Author : Gwenole Beauchesne # Created On : Wed Jan 12 12:38:53 EST 2005 #--------------------------------------------------------------- |