Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r231 | boklm | 2011-01-06 17:30:05 +0000 (Thu, 06 Jan 2011) | 1 line

import rpm-setup version cleaned by blino
------------------------------------------------------------------------

24 files changed, 39 insertions, 42 deletions

diff --git a/Makefile.am b/Makefile.am
index 3f25989..5c1c0db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile.am 271263 2010-11-01 23:20:42Z peroyvind $
 
 arch_macrosfiles = $(RPMALLARCH:=.macros)
 
diff --git a/NEWS b/NEWS
index 235f69f..1f9b723 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,3 @@
-Version 1.114 - 13 December 2010, by Per Øyvind Karlsen
-- drop our own re-definition of %_query_all_fmt in favor of upstream default
-  to get disttag, distepoch & arch in query results.
-- only add runtime dependencies in rubygems.rb (Rémy Clouard)
-
 Version 1.113 - 2 November 2010, by Funda Wang
 - find gstreamer provides
 
diff --git a/README b/README
index 37e1ac6..531025c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-rpm-mandriva-setup
-$Id$
+rpm-mageia-setup
+$Id: README 22754 2007-02-22 13:03:02Z nanardon $
 
-This package contains configuration and script for the mandriva rpm.
+This package contains configuration and script for the Mageia rpm.
 
 Some file come from .in, this allow to transform path for testing purpose.
 If your file or script contains path, you should make a .in files.
@@ -32,6 +32,6 @@ $ make
 $ make install
 
 Now we can say to rpm to use fake config:
-rpm --rcfile $fakeroot/mandriva/rpmrc other command...
+rpm --rcfile $fakeroot/mageia/rpmrc other command...
 
 Happy Hacking
diff --git a/brp-compress b/brp-compress
index 4b27acd..b1bf0dc 100755
--- a/brp-compress
+++ b/brp-compress
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id$
+# $Id: brp-compress 11488 2005-04-29 03:14:31Z othauvin $
 
 # If using normal root, avoid changing anything.
 if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
diff --git a/build.macros.in b/build.macros.in
index 30ca07f..8e9a8ba 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -144,15 +144,15 @@ done \
 GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} --makefile-uninstall-rule  $SCHEMAS > /dev/null || true ; fi \
 %{nil}
 
-# Mandriva Linux version
+# Mageia Linux version
 # - "9.1"    =>  910
 # - "10.2.2" => 1022
 # (user may copy the following line in specfile)
-%mdkversion		%(perl -pe '/(\\d+)\\.(\\d)\\.?(\\d)?/; $_="$1$2".($3||0)' /etc/mandriva-release)
+%mgaversion		%(perl -pe '/(\\d+)\\.(\\d)\\.?(\\d)?/; $_="$1$2".($3||0)' /etc/release)
 
-%distsuffix mdv
+%distsuffix mga
 
-%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:mdv}%{?mandriva_release:%mandriva_release}
+%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:mga}%{?distro_release:%distro_release}
 
 #==============================================================================
 # ---- Build policy macros.
diff --git a/configure.ac b/configure.ac
index 0ae9143..f4a17ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-# $Id$
+# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.114, nanardon@mandriva.org)
+AC_INIT(rpm-mageia-setup, 1.114, nanardon@mageia.org)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.9 -Wno-portability)
 AC_CONFIG_SRCDIR
@@ -118,7 +118,7 @@ RPMOS="$build_os_noversion"
 AC_SUBST(RPMOS)
 
 # Checks for library functions.
-RPMVENDOR="Mandriva"
+RPMVENDOR="Mageia"
 AC_ARG_WITH(vendor, [  --with-vendor            the vendor of this config  ])
 if test $with_vendor; then
     RPMVENDOR=$with_vendor
diff --git a/filter.sh b/filter.sh
index 8ff38f2..0bda911 100755
--- a/filter.sh
+++ b/filter.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 #---------------------------------------------------------------
-# Project         : Mandriva Linux
+# Project         : Mageia
 # Module          : rpm
 # File            : filter.sh
-# Version         : $Id$
+# Version         : $Id: filter.sh 227371 2007-09-08 15:34:39Z anssi $
 # Author          : Frederic Lepied
 # Created On      : Tue May 13 15:45:17 2003
 # Purpose         : filter using grep and first argument the
diff --git a/find-lang.pl b/find-lang.pl
index 249125d..66f507c 100644..100755
--- a/find-lang.pl
+++ b/find-lang.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id$
+# $Id: find-lang.pl 243013 2008-06-23 13:01:50Z pixel $
 
 use strict;
 use warnings;
diff --git a/find-provides.in b/find-provides.in
index eee22ca..5476964 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -111,7 +111,7 @@ fi
 
 #
 # --- gstreamer modules.
-[ -x /usr/lib/rpm/mandriva/gstreamer.prov ] &&
-    echo "$solist" | tr '[:blank:]' \\n | /usr/lib/rpm/mandriva/gstreamer.prov | sort -u
+[ -x @RPMVENDORDIR@/gstreamer.prov ] &&
+    echo "$solist" | tr '[:blank:]' \\n | @RPMVENDORDIR@/gstreamer.prov | sort -u
 
 exit 0
diff --git a/find-requires.in b/find-requires.in
index 79a4feb..b7f70c9 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -16,7 +16,7 @@ elif [ X"$3" = Xobjdump ]; then
     needed=1
 fi
 
-# --- Mandriva Linux specific part
+# --- Mageia specific part
 case "$LD_PRELOAD" in
     *libfakeroot*)
 	unset LD_PRELOAD
diff --git a/git-repository--after-tarball b/git-repository--after-tarball
index 47844d0..b9aa92f 100755
--- a/git-repository--after-tarball
+++ b/git-repository--after-tarball
@@ -64,7 +64,7 @@ if [ ! -e .git ]; then
 fi
 git add . 
 set_GIT_AUTHOR_DATE $tarballs
-git commit -q -a --author="unknown author <cooker@mandrivalinux.org>" -m "imported $tarballs" 
+git commit -q -a --author="unknown author <mageia-dev@mageia.org>" -m "imported $tarballs" 
 git branch -f vanilla
 git branch -f patches-applied
 git checkout patches-applied
diff --git a/git-repository--apply-patch b/git-repository--apply-patch
index 1ad72fa..1e1b3cb 100755
--- a/git-repository--apply-patch
+++ b/git-repository--apply-patch
@@ -64,7 +64,7 @@ sub git_commit {
     my ($msg, $date) = @_;
 
     $ENV{GIT_AUTHOR_DATE} = $date;
-    open(my $F, '| git commit -q --author="unknown author <cooker@mandrivalinux.org>" --file=-');
+    open(my $F, '| git commit -q --author="unknown author <mageia-dev@mageia.org>" --file=-');
     print $F $msg;
     close $F or die "git commit failed\n";
 }
diff --git a/macros-perarch.in b/macros-perarch.in
index a604ab6..e52d252 100644
--- a/macros-perarch.in
+++ b/macros-perarch.in
@@ -1,5 +1,5 @@
 # Per-platform rpm configuration file.
-# $Id$
+# $Id: macros-perarch.in 233523 2008-01-28 17:41:27Z pixel $
 
 #==============================================================================
 # ---- per-platform macros.
diff --git a/macros.in b/macros.in
index 7f78137..bf82398 100644
--- a/macros.in
+++ b/macros.in
@@ -1,8 +1,8 @@
 # @RPMVENDORDIR@/macros:
-# Main Mandrivalinux rpm configuration
+# Main Mangeia rpm configuration
 # Only modified macros goes here
 #
-# $Id$
+# $Id: macros.in 260920 2009-09-25 10:10:18Z blino $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -48,6 +48,8 @@
 
 %_repackage_all_erasures	0
 
+%_query_all_fmt		%%{name}-%%{version}-%%{release}
+
 %_rpmlock_path  %{_dbpath}/__db.000
 
 # activate filetriggers (cf http://wiki.mandriva.com/en/Rpm_filetriggers)
diff --git a/make_arch_macrosfiles.sh.in b/make_arch_macrosfiles.sh.in
index 05be025..90d5725 100644
--- a/make_arch_macrosfiles.sh.in
+++ b/make_arch_macrosfiles.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id$
+# $Id: make_arch_macrosfiles.sh.in 233560 2008-01-29 15:58:29Z pixel $
 
 MINPUT="$1"
 ARCH="$2"
diff --git a/perl.prov b/perl.prov
index b2748e8..a6d68bb 100755
--- a/perl.prov
+++ b/perl.prov
@@ -142,9 +142,9 @@ sub process_file {
 
     # here are examples of VERSION lines from the perl distribution
 
-    #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
-    #ExtUtils/Install.pm:$VERSION = substr q$Revision$, 10;
-    #CGI/Apache.pm:$VERSION = (qw$Revision$)[1];
+    #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision: 270245 $ =~ /(\d+)\.(\d+)/);
+    #ExtUtils/Install.pm:$VERSION = substr q$Revision: 270245 $, 10;
+    #CGI/Apache.pm:$VERSION = (qw$Revision: 270245 $)[1];
     #DynaLoader.pm:$VERSION = $VERSION = "1.03";     # avoid typo warning
     #$Locale::Maketext::Simple::VERSION = '0.21';
 
diff --git a/perl.req-from-meta b/perl.req-from-meta
index 4f921f6..3105259 100755
--- a/perl.req-from-meta
+++ b/perl.req-from-meta
@@ -47,7 +47,7 @@ perl.req-from-meta - extract requires from meta file
 
 This script will extract Perl requirements from the distribution meta
 file. For each such requires, it'll convert the minimum version to
-follow mandriva perl versioning (using C<%perl_convert_version>), and
+follow Mageia perl versioning (using C<%perl_convert_version>), and
 print them as:
 
     perl(Foo::Bar)
diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 3f16a29..7f843ed 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -1,6 +1,6 @@
 ;;; rpm-spec-mode.el --- RPM spec file editing commands for Emacs/XEmacs
 
-;; $Id$
+;; $Id: rpm-spec-mode.el 232641 2007-12-20 09:58:22Z pixel $
 
 ;; Copyright (C) 1997-2002 Stig Bjørlykke, <stigb@tihlde.org>
 
@@ -354,7 +354,7 @@ value returned by function `user-mail-address'."
   "List of elements that are valid tags.")
 
 ;; echo "(defvar rpm-group-tags-list"
-;; echo "      ;; Auto generated from Mandrake linux GROUPS file"
+;; echo "      ;; Auto generated from Mageia GROUPS file"
 ;; printf "\t%s\n" "'("
 ;; cat /usr/share/doc/*/GROUPS | while read i; do
 ;;             printf "\t   %s%s%s\n" '("' "$i" '")'
@@ -362,7 +362,7 @@ value returned by function `user-mail-address'."
 ;; printf "\t%s\n\t%s" ")" '"List of elements that are valid group tags.")'
 
 (defvar rpm-group-tags-list
-      ;; Auto generated from Mandrake Linux GROUPS file
+      ;; Auto generated from Mageia GROUPS file
 	'(
 	   ("Accessibility")
 	   ("Archiving/Backup")
diff --git a/rpmeval.c b/rpmeval.c
index c719352..c6b1469 100644
--- a/rpmeval.c
+++ b/rpmeval.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rpmeval.c 271130 2010-10-16 11:12:45Z peroyvind $ */
 
 #include <stdint.h>
 
diff --git a/rpmrc.in b/rpmrc.in
index a86a1b7..5e21d93 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: rpmrc.in 232782 2008-01-07 17:34:01Z pixel $
 #
 # @RPMVENDORDIR@/rpmrc
 
diff --git a/rubygems.rb b/rubygems.rb
index 1a775bd..0ae5979 100755
--- a/rubygems.rb
+++ b/rubygems.rb
@@ -74,7 +74,7 @@ if gems.length > 0
     end
     if requires
       for d in spec.dependencies
-        print d.requirement.to_rpm(d.name) unless d.type != :runtime
+        print d.requirement.to_rpm(d.name)
       end
       for d in spec.required_rubygems_version.to_rpm("rubygems")
         print d.gsub(/(rubygem\()|(\))/, "")
diff --git a/tests.sh b/tests.sh
index 99c333b..2fec7a0 100755
--- a/tests.sh
+++ b/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id$
+# $Id: tests.sh 22753 2007-02-22 13:01:24Z nanardon $
 
 allerrs=0
 
diff --git a/tests/findlang.pl b/tests/findlang.pl
index d601728..d601728 100644..100755
--- a/tests/findlang.pl
+++ b/tests/findlang.pl
diff --git a/tests/macros.sh b/tests/macros.sh
index 9723e59..60cbbae 100755
--- a/tests/macros.sh
+++ b/tests/macros.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id$
+# $Id: macros.sh 242828 2008-06-02 12:41:00Z pixel $
 
 RPMEVAL=./rpmeval