[Mageia-sysadm] [430] tag 1.116

root at mageia.org root at mageia.org
Sat Feb 5 23:14:04 CET 2011


Revision: 430
Author:   tmb
Date:     2011-02-05 23:13:37 +0100 (Sat, 05 Feb 2011)
Log Message:
-----------
tag 1.116

Added Paths:
-----------
    rpm/rpm-setup/tags/1.116/
    rpm/rpm-setup/tags/1.116/Makefile.am
    rpm/rpm-setup/tags/1.116/NEWS
    rpm/rpm-setup/tags/1.116/build.macros.in
    rpm/rpm-setup/tags/1.116/configure.ac
    rpm/rpm-setup/tags/1.116/drop-ld-no-undefined-for-shared-lib-modules-in-libtool
    rpm/rpm-setup/tags/1.116/fix-dlsearch-path-in-libtool-for-multilib
    rpm/rpm-setup/tags/1.116/fix-libtool-from-moving-options-after-libs
    rpm/rpm-setup/tags/1.116/fix-libtool-ltmain-from-overlinking
    rpm/rpm-setup/tags/1.116/force-as-needed-for-shared-lib-in-libtool
    rpm/rpm-setup/tags/1.116/macros.in
    rpm/rpm-setup/tags/1.116/rpmb_deprecated
    rpm/rpm-setup/tags/1.116/rpmpopt
    rpm/rpm-setup/tags/1.116/rpmrc.in

Removed Paths:
-------------
    rpm/rpm-setup/tags/1.116/Makefile.am
    rpm/rpm-setup/tags/1.116/NEWS
    rpm/rpm-setup/tags/1.116/build.macros.in
    rpm/rpm-setup/tags/1.116/configure.ac
    rpm/rpm-setup/tags/1.116/macros.in
    rpm/rpm-setup/tags/1.116/rpmrc.in

Deleted: rpm/rpm-setup/tags/1.116/Makefile.am
===================================================================
--- rpm/rpm-setup/trunk/Makefile.am	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/tags/1.116/Makefile.am	2011-02-05 22:13:37 UTC (rev 430)
@@ -1,155 +0,0 @@
-# $Id: Makefile.am 271263 2010-11-01 23:20:42Z peroyvind $
-
-arch_macrosfiles = $(RPMALLARCH:=.macros)
-
-pkg_data = 
-
-pkg_gdata = \
-		   macros
-
-pkg_sysconf_macros_tmp = \
-		   build.macros
-
-pkg_data_in = $(pkg_gdata:=.in)
-
-pkg_sysconf_macros_in = $(pkg_sysconf_macros_tmp:=.in)
-
-pkg_sysconf_macros = $(pkg_sysconf_macros_tmp)
-
-pkg_gconfig = \
-		   platform \
-		   $(if $(CANONTARGETCPU32), platform32, )
-
-pkg_scripts = \
-		   brp-compress \
-	       brp-strip \
-	       brp-strip-comment-note \
-		   brp-strip-static-archive \
-           filter.sh \
-	       find-lang.pl \
-	       find-debuginfo.sh \
-	       gem_helper.rb \
-	        git-repository--after-tarball \
-	        git-repository--apply-patch \
-		   http.req \
-		   magic.prov \
-		   magic.req \
-		   kmod.prov \
-		   perl.prov \
-		   perl.req \
-		   perl.req-from-meta \
-		   php.prov \
-		   php.req \
-		   pkgconfigdeps.sh \
-		   pythoneggs.py \
-		   rubygems.rb
-
-pkg_gscripts = \
-		   find-provides \
-		   find-requires \
-		   find-provides.perl
-
-pkg_scripts_in = $(pkg_gscripts:=.in)
-
-BUILT_SOURCES = macros-perarch make_arch_macrosfiles.sh rpmgenplatform
-
-pkglibdir = @RPMVENDORDIR@
-
-noinst_PROGRAMS = rpmeval
-
-rpmeval_SOURCES = rpmeval.c
-
-rpmeval_LDFLAGS = -lrpm
-
-noinst_DATA = $(pkg_gconfig)
-
-pkglib_DATA = \
-	$(pkg_data) \
-	$(pkg_gdata)
-	$(pkg_gconfig)
-
-pkglib_SCRIPTS = \
-	$(pkg_scripts) \
-	$(pkg_gscripts)
-
-EXTRA_DIST = \
-	$(pkg_data) \
-	$(pkg_data_in) \
-	$(pkg_sysconf_macros_in) \
-	$(pkg_scripts) \
-	$(pkg_scripts_in) \
-	macros-perarch.in make_arch_macrosfiles.sh.in \
-	rpmgenplatform.in rpmrc.in \
-	rpm-spec-mode.el \
-	tests.sh tests/macros.sh \
-	tests/findlang.pl tests/findlang.sh
-
-edit = sed \
-	-e 's, at RPMVENDOR\@,$(RPMVENDOR),g' \
-	-e 's, at RPMVENDORDIR\@,$(RPMVENDORDIR),g' \
-	-e 's, at RPMCANONVENDOR\@,$(RPMCANONVENDOR),g' \
-	-e 's, at RPMLIBDIR\@,$(RPMLIBDIR),g' \
-	-e 's, at RPMSYSCONFDIR\@,$(RPMSYSCONFDIR),g'\
-	-e 's, at RPMOS\@,$(RPMOS),g' \
-	-e 's, at CANONTARGETCPU\@,$(CANONTARGETCPU),g' \
-	-e 's, at CANONTARGETGNU\@,$(CANONTARGETGNU),g' \
-	-e 's, at RPMALLARCH\@,$(RPMALLARCH),g'
-
-%: %.in Makefile
-	$(edit) $< > $@
-
-$(arch_macrosfiles): rpmrc macros-perarch make_arch_macrosfiles.sh
-	arch=`echo $@ | sed 's,\\.macros,,'`; \
-	sh ./make_arch_macrosfiles.sh macros-perarch $$arch > $@
-
-platform: rpmgenplatform Makefile
-	perl rpmgenplatform $(CANONTARGETCPU) > $@
-
-platform32: rpmgenplatform Makefile
-	perl rpmgenplatform $(CANONTARGETCPU32) > $@
-
-install-data-local: $(arch_macrosfiles) $(pkg_gconfig) $(pkg_sysconf_macros_tmp)
-if ONLY_RPMRC
-	echo "not installing per-arch macros which are already in rpmrc and standard rpm per-arch macros"
-else
-	for i in $(RPMALLARCH); do \
-	  $(mkinstalldirs) $(DESTDIR)$(RPMVENDORDIR)/platform/$${i}-$(RPMOS); \
-	  $(install_sh_DATA) $${i}.macros $(DESTDIR)$(RPMVENDORDIR)/platform/$${i}-$(RPMOS)/macros; \
-	done
-endif
-	[ -d $(DESTDIR)$(RPMSYSCONFDIR)/macros.d ] || $(mkinstalldirs) $(DESTDIR)$(RPMSYSCONFDIR)/macros.d
-	for i in $(pkg_sysconf_macros); do \
-		$(install_sh_DATA) $${i} $(DESTDIR)$(RPMSYSCONFDIR)/macros.d/$${i}; \
-	done
-if RPMPLATFORM
-	for i in $(pkg_gconfig); do \
-		$(install_sh_DATA) $${i} $(DESTDIR)$(RPMSYSCONFDIR)/$${i}; \
-	done
-	$(install_sh_SCRIPT) rpmgenplatform $(DESTDIR)$(bindir)/rpmgenplatform
-endif
-
-.PHONY: ChangeLog test
-
-ChangeLog:
-	@if [ -e ".svn" ]; then \
-	    $(MAKE) ChangeLog-svn; \
-	elif [ -e ".git" ]; then \
-	    $(MAKE) ChangeLog-git; \
-	else \
-	    echo "Unknown SCM (not SVN nor GIT)";\
-	    exit 1; \
-	fi;
-
-ChangeLog-svn:
-	LC_ALL=C svn2cl
-	rm -f *.bak
-
-ChangeLog-git:
-	@git2cl >ChangeLog
-
-test: $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig)
-	sh tests.sh
-
-CLEANFILES = $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig)\
-			 rpmrc macros-perarch $(pkg_sysconf_macros_tmp) \
-			 make_arch_macrosfiles.sh

Copied: rpm/rpm-setup/tags/1.116/Makefile.am (from rev 428, rpm/rpm-setup/trunk/Makefile.am)
===================================================================
--- rpm/rpm-setup/tags/1.116/Makefile.am	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/Makefile.am	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,164 @@
+# $Id: Makefile.am 271263 2010-11-01 23:20:42Z peroyvind $
+
+arch_macrosfiles = $(RPMALLARCH:=.macros)
+
+pkg_data = \
+		   rpmpopt
+
+pkg_gdata = \
+		   macros \
+		   rpmrc
+
+pkg_sysconf_macros_tmp = \
+		   build.macros
+
+pkg_data_in = $(pkg_gdata:=.in)
+
+pkg_sysconf_macros_in = $(pkg_sysconf_macros_tmp:=.in)
+
+pkg_sysconf_macros = $(pkg_sysconf_macros_tmp)
+
+pkg_gconfig = \
+		   platform \
+		   $(if $(CANONTARGETCPU32), platform32, )
+
+pkg_scripts = \
+		   brp-compress \
+		   brp-strip \
+		   brp-strip-comment-note \
+		   brp-strip-static-archive \
+		   drop-ld-no-undefined-for-shared-lib-modules-in-libtool \
+		   filter.sh \
+		   find-lang.pl \
+		   find-debuginfo.sh \
+		   fix-dlsearch-path-in-libtool-for-multilib \
+		   fix-libtool-from-moving-options-after-libs \
+		   fix-libtool-ltmain-from-overlinking \
+		   force-as-needed-for-shared-lib-in-libtool \
+		   gem_helper.rb \
+	           git-repository--after-tarball \
+	           git-repository--apply-patch \
+		   http.req \
+		   magic.prov \
+		   magic.req \
+		   kmod.prov \
+		   perl.prov \
+		   perl.req \
+		   perl.req-from-meta \
+		   php.prov \
+		   php.req \
+		   pkgconfigdeps.sh \
+		   pythoneggs.py \
+		   rubygems.rb
+
+pkg_gscripts = \
+		   find-provides \
+		   find-requires \
+		   find-provides.perl
+
+pkg_scripts_in = $(pkg_gscripts:=.in)
+
+BUILT_SOURCES = macros-perarch make_arch_macrosfiles.sh rpmgenplatform
+
+pkglibdir = @RPMVENDORDIR@
+
+noinst_PROGRAMS = rpmeval
+
+rpmeval_SOURCES = rpmeval.c
+
+rpmeval_LDFLAGS = -lrpm
+
+noinst_DATA = $(pkg_gconfig)
+
+pkglib_DATA = \
+	$(pkg_data) \
+	$(pkg_gdata)
+	$(pkg_gconfig)
+
+pkglib_SCRIPTS = \
+	$(pkg_scripts) \
+	$(pkg_gscripts)
+
+EXTRA_DIST = \
+	$(pkg_data) \
+	$(pkg_data_in) \
+	$(pkg_sysconf_macros_in) \
+	$(pkg_scripts) \
+	$(pkg_scripts_in) \
+	macros-perarch.in make_arch_macrosfiles.sh.in \
+	rpmgenplatform.in rpmrc.in \
+	rpm-spec-mode.el \
+	rpmb_deprecated \
+	tests.sh tests/macros.sh \
+	tests/findlang.pl tests/findlang.sh
+
+edit = sed \
+	-e 's, at RPMVENDOR\@,$(RPMVENDOR),g' \
+	-e 's, at RPMVENDORDIR\@,$(RPMVENDORDIR),g' \
+	-e 's, at RPMCANONVENDOR\@,$(RPMCANONVENDOR),g' \
+	-e 's, at RPMLIBDIR\@,$(RPMLIBDIR),g' \
+	-e 's, at RPMSYSCONFDIR\@,$(RPMSYSCONFDIR),g'\
+	-e 's, at RPMOS\@,$(RPMOS),g' \
+	-e 's, at CANONTARGETCPU\@,$(CANONTARGETCPU),g' \
+	-e 's, at CANONTARGETGNU\@,$(CANONTARGETGNU),g' \
+	-e 's, at RPMALLARCH\@,$(RPMALLARCH),g'
+
+%: %.in Makefile
+	$(edit) $< > $@
+
+$(arch_macrosfiles): rpmrc macros-perarch make_arch_macrosfiles.sh
+	arch=`echo $@ | sed 's,\\.macros,,'`; \
+	sh ./make_arch_macrosfiles.sh macros-perarch $$arch > $@
+
+platform: rpmgenplatform Makefile
+	perl rpmgenplatform $(CANONTARGETCPU) > $@
+
+platform32: rpmgenplatform Makefile
+	perl rpmgenplatform $(CANONTARGETCPU32) > $@
+
+install-data-local: $(arch_macrosfiles) $(pkg_gconfig) $(pkg_sysconf_macros_tmp)
+if ONLY_RPMRC
+	echo "not installing per-arch macros which are already in rpmrc and standard rpm per-arch macros"
+else
+	for i in $(RPMALLARCH); do \
+	  $(mkinstalldirs) $(DESTDIR)$(RPMVENDORDIR)/platform/$${i}-$(RPMOS); \
+	  $(install_sh_DATA) $${i}.macros $(DESTDIR)$(RPMVENDORDIR)/platform/$${i}-$(RPMOS)/macros; \
+	done
+endif
+	[ -d $(DESTDIR)$(RPMSYSCONFDIR)/macros.d ] || $(mkinstalldirs) $(DESTDIR)$(RPMSYSCONFDIR)/macros.d
+	$(install_sh_SCRIPT) rpmb_deprecated $(DESTDIR)$(RPMLIBDIR)
+	for i in $(pkg_sysconf_macros); do \
+		$(install_sh_DATA) $${i} $(DESTDIR)$(RPMSYSCONFDIR)/macros.d/$${i}; \
+	done
+if RPMPLATFORM
+	for i in $(pkg_gconfig); do \
+		$(install_sh_DATA) $${i} $(DESTDIR)$(RPMSYSCONFDIR)/$${i}; \
+	done
+	$(install_sh_SCRIPT) rpmgenplatform $(DESTDIR)$(bindir)/rpmgenplatform
+endif
+
+.PHONY: ChangeLog test
+
+ChangeLog:
+	@if [ -e ".svn" ]; then \
+	    $(MAKE) ChangeLog-svn; \
+	elif [ -e ".git" ]; then \
+	    $(MAKE) ChangeLog-git; \
+	else \
+	    echo "Unknown SCM (not SVN nor GIT)";\
+	    exit 1; \
+	fi;
+
+ChangeLog-svn:
+	LC_ALL=C svn2cl
+	rm -f *.bak
+
+ChangeLog-git:
+	@git2cl >ChangeLog
+
+test: $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig)
+	sh tests.sh
+
+CLEANFILES = $(pkg_gdata) $(pkg_gscripts) $(arch_macrosfiles) $(pkg_gconfig)\
+			 macros-perarch $(pkg_sysconf_macros_tmp) \
+			 make_arch_macrosfiles.sh

Deleted: rpm/rpm-setup/tags/1.116/NEWS
===================================================================
--- rpm/rpm-setup/trunk/NEWS	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/tags/1.116/NEWS	2011-02-05 22:13:37 UTC (rev 430)
@@ -1,116 +0,0 @@
-Version 1.114 - 9 December 2010, by Rémy Clouard
-- only add runtime dependencies in rubygems.rb
-
-Version 1.113 - 2 November 2010, by Funda Wang
-- find gstreamer provides
-
-Version 1.112 - 1 November 2010, by Per Øyvind Karlsen
-- enable python egg provides/requires.
-
-Version 1.111 - 30 October 2010, by Anssi Hannula
-- generate requires on "python(abi) = x.y" instead of "python >= x.y" for
-  python modules to properly handle the strict dependency
-- remove runtime dependencies from %py_requires as they are now handled
-  automatically
-
-Version 1.110 - 18 October 2010, by Per Øyvind Karlsen
-- fix warning from rubygems.rb
-- drop %gem_unpack, equivalent behaviour has been implemented in %setup now
- 
-Version 1.109 - 16 October 2010, by Per Øyvind Karlsen
-- don't install dependencies for gems when using %gem_install
-- fix build with rpm 5.3
-
-Version 1.108 - 16 October 2010, by Per Øyvind Karlsen
-- add gem_helper.rb and it's corresponding macros %gem_unpack, %gem_build &
-  gem_install for simplifying & streamlining ruby gem packaging.
- 
-Version 1.107 -  9 September 2010, by Per Øyvind Karlsen
-- enable automatic dependency extraction for ruby gems
-
-Version 1.106 - 16 July 2010, by Jerome Quelin
-- extract perl module version when $Full::Package::VERSION is set
-
-Version 1.105 - 14 July 2010, by Jerome Quelin
-- support to extract perl runtime requires from meta spec 2
-
-Version 1.104 - 27 April 2010, by Christophe Fergeau
-- revert previous '-g' addition when stripping shared libraries since it 
-  increases shared library sizes by 10 to 20% for no good reason
-
-Version 1.103 - 16 April 2010, by Per Øyvind Karlsen
-- strip shared libraries with the '-g' option
-
-Version 1.102 -  8 April 2010, by Michael Scherer
-- do not requires python 2.X branch rpm for python 3.X modules, 
-  requires instead python 3.X interpreter
-
-Version 1.101 - 26 March 2010, by Jerome Quelin
-- fix find-requires to call perl.req-from-meta with the correct meta
-  file when there are multiple meta file in the package
-
-Version 1.100 - 14 March 2010, by Jerome Quelin
-- fix find-requires to look for correct meta.yml before calling
-  perl.req-from-meta
-- make perl.prov skip comment lines
-
-Version 1.99 -  9 March 2010, by Per Øyvind Karlsen
-- allow for for only stripping files without creating debug package contents by
-  setting DISABLE_DEBUG environment variable.
-
-Version 1.98 -  5 March 2010, by Per Øyvind Karlsen
-- Update find-debuginfo.sh from upstream
-- new script: perl.req-from-meta (jquelin)
-
-Version 1.97 - 12 December 2009, by Anssi Hannula
-- fix package build when the debug package is empty (regression introduded in
-  1.96)
-
-Version 1.96 - 10 December 2009, by Anssi Hannula
-- fix perl.prov to assign versions to provides when the version is declared
-  with 'our' or 'my' keyword, or when it is prepended with code
-  (Jérôme Quelin)
-- replace %sunsparc with %sparc & %sparcx (from rpm5.org, Per Øyvind Karlsen)
-- support ELF executables only as a.out has been deprecated since ages
-  ago (fixes objdump 'File format not recognized' errors) (Per Øyvind Karlsen)
-- don't try finding debug files in buildroot when there's none
-  (Per Øyvind Karlsen)
-
-Version 1.95 - 25 September 2009, by Olivier Blin
-- MIPS and ARM support (from Arnaud Patard):
-  o add mipsel support
-  o introduce CANONTARGETGNU, to be able to use -gnueabi for ARM
-  o add arm support and use -gnueabi instead of -gnu
-
-Version 1.94 - 8 August 2009, by Anssi Hannula
-- update perl_convert_version to keep alphabetic tail in version number
-  (Luca Berra)
-
-Version 1.93 - 28 July 2009, by Christophe Fergeau
-- update perl_convert_version macro (Jérôme Quelin)
-
-Version 1.92 - 9 July 2009, by Christophe Fergeau 
-- making sure automatic provides & requires for perl package are using the
-  new macro %perl_convert_version (jquelin)
-- rpm5 fixes (peroyvind)
-
-Version 1.91 - 3 February 2009, by Christophe Fergeau
-- build.macros.in
-  o add new perl_convert_version macro to convert cpan version to rpm version
-- git-repository--after-tarball:
-  o commit the tarball with user "unknown author <cooker at mandrivalinux.org>"
-  o commit the tarball using the tarball's modification time
-
-Version 1.90 - 29 January 2009, by Pixel
-
-- call patch with -U (aka --unified-reject-files)
-
-Version 1.89 - 29 January 2009, by Pixel
-
-- when %_with_git_repository is set, define %_after_setup and %_patch to use
-  the new scripts git-repository--after-tarball and git-repository--apply-patch
-
-Version 1.88 - 7 January 2009, by Christophe Fergeau
-
-- fix ugly warning during invocation of php.req
-- RPM5 fixes 

Copied: rpm/rpm-setup/tags/1.116/NEWS (from rev 427, rpm/rpm-setup/trunk/NEWS)
===================================================================
--- rpm/rpm-setup/tags/1.116/NEWS	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/NEWS	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,126 @@
+Version 1.116 - 5 February 2011, by Thomas Backlund
+- merge rpmrc from rpm-manbo-setup
+- merge manbo.macros from rpm-manbo-setup
+- merge manbo-build.macros from rpm-manbo-setup
+- merge under/overlinking scripts from rpm-manbo-setup
+- merge rpm -b deprecated warning scripts from rpm-manbo-setup
+
+Version 1.115 - 9 January 2011, by Oliver Blin
+- initial Mageia import
+
+Version 1.114 - 9 December 2010, by Rémy Clouard
+- only add runtime dependencies in rubygems.rb
+
+Version 1.113 - 2 November 2010, by Funda Wang
+- find gstreamer provides
+
+Version 1.112 - 1 November 2010, by Per Øyvind Karlsen
+- enable python egg provides/requires.
+
+Version 1.111 - 30 October 2010, by Anssi Hannula
+- generate requires on "python(abi) = x.y" instead of "python >= x.y" for
+  python modules to properly handle the strict dependency
+- remove runtime dependencies from %py_requires as they are now handled
+  automatically
+
+Version 1.110 - 18 October 2010, by Per Øyvind Karlsen
+- fix warning from rubygems.rb
+- drop %gem_unpack, equivalent behaviour has been implemented in %setup now
+ 
+Version 1.109 - 16 October 2010, by Per Øyvind Karlsen
+- don't install dependencies for gems when using %gem_install
+- fix build with rpm 5.3
+
+Version 1.108 - 16 October 2010, by Per Øyvind Karlsen
+- add gem_helper.rb and it's corresponding macros %gem_unpack, %gem_build &
+  gem_install for simplifying & streamlining ruby gem packaging.
+ 
+Version 1.107 -  9 September 2010, by Per Øyvind Karlsen
+- enable automatic dependency extraction for ruby gems
+
+Version 1.106 - 16 July 2010, by Jerome Quelin
+- extract perl module version when $Full::Package::VERSION is set
+
+Version 1.105 - 14 July 2010, by Jerome Quelin
+- support to extract perl runtime requires from meta spec 2
+
+Version 1.104 - 27 April 2010, by Christophe Fergeau
+- revert previous '-g' addition when stripping shared libraries since it 
+  increases shared library sizes by 10 to 20% for no good reason
+
+Version 1.103 - 16 April 2010, by Per Øyvind Karlsen
+- strip shared libraries with the '-g' option
+
+Version 1.102 -  8 April 2010, by Michael Scherer
+- do not requires python 2.X branch rpm for python 3.X modules, 
+  requires instead python 3.X interpreter
+
+Version 1.101 - 26 March 2010, by Jerome Quelin
+- fix find-requires to call perl.req-from-meta with the correct meta
+  file when there are multiple meta file in the package
+
+Version 1.100 - 14 March 2010, by Jerome Quelin
+- fix find-requires to look for correct meta.yml before calling
+  perl.req-from-meta
+- make perl.prov skip comment lines
+
+Version 1.99 -  9 March 2010, by Per Øyvind Karlsen
+- allow for for only stripping files without creating debug package contents by
+  setting DISABLE_DEBUG environment variable.
+
+Version 1.98 -  5 March 2010, by Per Øyvind Karlsen
+- Update find-debuginfo.sh from upstream
+- new script: perl.req-from-meta (jquelin)
+
+Version 1.97 - 12 December 2009, by Anssi Hannula
+- fix package build when the debug package is empty (regression introduded in
+  1.96)
+
+Version 1.96 - 10 December 2009, by Anssi Hannula
+- fix perl.prov to assign versions to provides when the version is declared
+  with 'our' or 'my' keyword, or when it is prepended with code
+  (Jérôme Quelin)
+- replace %sunsparc with %sparc & %sparcx (from rpm5.org, Per Øyvind Karlsen)
+- support ELF executables only as a.out has been deprecated since ages
+  ago (fixes objdump 'File format not recognized' errors) (Per Øyvind Karlsen)
+- don't try finding debug files in buildroot when there's none
+  (Per Øyvind Karlsen)
+
+Version 1.95 - 25 September 2009, by Olivier Blin
+- MIPS and ARM support (from Arnaud Patard):
+  o add mipsel support
+  o introduce CANONTARGETGNU, to be able to use -gnueabi for ARM
+  o add arm support and use -gnueabi instead of -gnu
+
+Version 1.94 - 8 August 2009, by Anssi Hannula
+- update perl_convert_version to keep alphabetic tail in version number
+  (Luca Berra)
+
+Version 1.93 - 28 July 2009, by Christophe Fergeau
+- update perl_convert_version macro (Jérôme Quelin)
+
+Version 1.92 - 9 July 2009, by Christophe Fergeau 
+- making sure automatic provides & requires for perl package are using the
+  new macro %perl_convert_version (jquelin)
+- rpm5 fixes (peroyvind)
+
+Version 1.91 - 3 February 2009, by Christophe Fergeau
+- build.macros.in
+  o add new perl_convert_version macro to convert cpan version to rpm version
+- git-repository--after-tarball:
+  o commit the tarball with user "unknown author <cooker at mandrivalinux.org>"
+  o commit the tarball using the tarball's modification time
+
+Version 1.90 - 29 January 2009, by Pixel
+
+- call patch with -U (aka --unified-reject-files)
+
+Version 1.89 - 29 January 2009, by Pixel
+
+- when %_with_git_repository is set, define %_after_setup and %_patch to use
+  the new scripts git-repository--after-tarball and git-repository--apply-patch
+
+Version 1.88 - 7 January 2009, by Christophe Fergeau
+
+- fix ugly warning during invocation of php.req
+- RPM5 fixes 

Deleted: rpm/rpm-setup/tags/1.116/build.macros.in
===================================================================
--- rpm/rpm-setup/trunk/build.macros.in	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/tags/1.116/build.macros.in	2011-02-05 22:13:37 UTC (rev 430)
@@ -1,349 +0,0 @@
-
-%__gzip			/usr/bin/gzip
-
-%_sys_macros_dir @RPMSYSCONFDIR@/macros.d
-%build_sysmacrospath() %{_sys_macros_dir}/%{?1:%{1}}%{?!1:%{name}}.macros
-
-# [Pixel, Dec 2008] deprecated, to remove as soon as rpm 4.6.0 dust settles down
-%defaultbuildroot  %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-
-# when %_with_git_repository is set, these macros modify the behaviour of "%prep" step:
-%_after_setup %{?_with_git_repository:GIT_URL="%{?git_url}" GIT_REPOSITORY_CACHE=%{?git_repository_cache} @RPMVENDORDIR@/git-repository--after-tarball}
-%_patch %{?_with_git_repository:PKG_NAME=%{name} @RPMVENDORDIR@/git-repository--apply-patch}%{?!_with_git_repository:%__patch -U}
-
-# used by "git-repository--after-tarball":
-%git_repository_cache %_topdir/%{name}.git
-
-
-# Various programs used in rpm scripts
-%_update_desktop_database_bin %{_bindir}/update-desktop-database
-%_update_mime_database_bin %{_bindir}/update-mime-database
-%_update_icon_cache_bin %{_bindir}/gtk-update-icon-cache
-%_gconftool_bin %{_bindir}/gconftool-2
-%_scrollkeeper_bin %{_bindir}/scrollkeeper-update
-
-%__service          /sbin/service
-%__chkconfig        /sbin/chkconfig
-
-#==============================================================================
-# ---- Required rpmrc macros.
-#	Macros that used to be initialized as a side effect of rpmrc parsing.
-#	These are the default values that can be overridden by other
-#	(e.g. per-platform, per-system, per-packager, per-package) macros.
-#
-
-%debug_package_and_restore %{debug_package} \
-%package __restore__\
-Summary: %{summary}\
-Group: %{group}\
-%description __restore__
-
-%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon k6
-
-%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
-%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
-
-#	Multilibs
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-%_arch_tag_suffix (%_lib)
-%arch_tagged() %{1}%{_arch_tag_suffix} %{?2:%{2} %{3}%{?!3:%{error:undefined 3rd argument in arch_tagged}}}
-
-# Games macros
-%_gamesdir	games
-%_gamesbindir   %{_prefix}/%{_gamesdir}
-%_gamesdatadir  %{_datadir}/%{_gamesdir}
-
-# Menu directories
-%_menudir %{_prefix}/lib/menu
-%_iconsdir %{_datadir}/icons
-%_miconsdir %{_datadir}/icons/mini
-%_liconsdir %{_datadir}/icons/large
-
-%_xfontdir %_datadir/fonts
-
-%_webconfdir %{_sysconfdir}/httpd/conf
-%_webappconfdir %_webconfdir/webapps.d
-# compatibility
-%webappconfdir %_webappconfdir
-
-#==============================================================================
-# ---- Build configuration macros.
-#
-# Package version macro.
-#	The type of package to produce, for compatibility with legacy
-#	versions of rpm.
-#
-# Script gets packaged file list on input.
-# Returns list of multiarch files that are not marked as such,
-# i.e. files in $RPM_BUILD_ROOT that have arch-dependent values
-#
-# Note: Disable (by commenting out) for legacy compatibility.
-#%__check_multiarch_files @RPMLIBDIR@/check-multiarch-files %{buildroot}
-
-# Use internal dependency generator rather than external helpers?
-%_use_internal_dependency_generator	0
-
-%__find_provides	@RPMVENDORDIR@/filter.sh '%{?_provides_exceptions:%{_provides_exceptions}}%{!?_provides_exceptions: }' '%{?_exclude_files_from_autoprov:%{_exclude_files_from_autoprov}}%{!?_exclude_files_from_autoprov: }' '%{buildroot}' @RPMVENDORDIR@/find-provides
-%__find_requires	@RPMVENDORDIR@/filter.sh '%{?_requires_exceptions:%{_requires_exceptions}}%{!?_requires_exceptions: }' '%{?_exclude_files_from_autoreq:%{_exclude_files_from_autoreq}}%{!?_exclude_files_from_autoreq: }' '%{buildroot}' @RPMVENDORDIR@/find-requires %{?buildroot:%{buildroot}} %{?_target_cpu:%{_target_cpu}}
-
-%find_lang  @RPMVENDORDIR@/find-lang.pl %{buildroot}
-
-# stuff below has been deprecated by rpm filetriggers [June 2008]
-%update_menus %{nil}
-%clean_menus %{nil}
-%update_desktop_database %{nil}
-%clean_desktop_database %{nil}
-%update_mime_database %{nil}
-%clean_mime_database %{nil}
-%update_scrollkeeper %{nil}
-%clean_scrollkeeper %{nil}
-
-# Update Menu
-%_update_menus_bin %{_bindir}/update-menus
-
-# Update Window Managers session.
-%_fndsession_bin %{_sbindir}/fndSession
-%make_session %{nil}
-%make_dm_session if [ -x %{_fndsession_bin} ]; then %{_fndsession_bin} || true ; fi \
-%{nil}
-
-# For rebuilding gcj-db
-%_rebuildgcjdb_bin %{_bindir}/rebuild-gcj-db
-%update_gcjdb if [ -x %{_rebuildgcjdb_bin} ]; then %{_rebuildgcjdb_bin} || true ; fi \
-%{nil}
-
-%clean_gcjdb if [ -x %{_rebuildgcjdb_bin} ]; then %{_rebuildgcjdb_bin} || true ; fi \
-%{nil}
-
-# Rebuild icon cache
-#
-# following themes are handled through filetriggers:
-%icon_cache_through_filetrigger_hicolor 1
-%icon_cache_through_filetrigger_gnome 1
-%icon_cache_through_filetrigger_oxygen 1
-
-%update_icon_cache() %{expand: %%{!?icon_cache_through_filetrigger_%1:if [ -x %%{_update_icon_cache_bin} ]; then \
-%%{_update_icon_cache_bin} --force --quiet %%{_iconsdir}/%%{1} || true; fi \
-%%{nil}}}
-
-%clean_icon_cache() %{expand: %%{!?icon_cache_through_filetrigger_%1:if [ -x %%{_update_icon_cache_bin} -a -r %%{_iconsdir}/%%{1}/index.theme ]; then \
-%%{_update_icon_cache_bin} --force --quiet %%{_iconsdir}/%%{1} || true ; fi \
-%%{nil}}}
-
-# GConf schemas:
-# installation is handled by filetriggers
-%post_install_gconf_schemas() %{nil}
-# but uninstall still need to be done in %preun:
-%preun_uninstall_gconf_schemas() if [ "$1" = "0" -a -x %{_gconftool_bin} ]; then \
-SCHEMAS="" \
-for SCHEMA in %{*} ; do \
-  SCHEMAS="$SCHEMAS %{_sysconfdir}/gconf/schemas/$SCHEMA.schemas" \
-done \
-GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} --makefile-uninstall-rule  $SCHEMAS > /dev/null || true ; fi \
-%{nil}
-
-# Mageia Linux version
-# - "9.1"    =>  910
-# - "10.2.2" => 1022
-# (user may copy the following line in specfile)
-%mgaversion		%(perl -pe '/(\\d+)\\.(\\d)\\.?(\\d)?/; $_="$1$2".($3||0)' /etc/release)
-
-%distsuffix .mga
-
-%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release}
-
-#==============================================================================
-# ---- Build policy macros.
-#
-#---------------------------------------------------------------------
-#   Expanded at end of %install scriptlet.
-#
-
-%__os_install_post    \
-    %{?__spec_helper_post}%{?!__spec_helper_post:/usr/share/spec-helper/spec-helper} \
-%{nil}
-
-%__debug_install_post   \
-   @RPMVENDORDIR@/find-debuginfo.sh "%{_builddir}/%{?buildsubdir}"\
-%{nil}
-
-
-#==============================================================================
-# ---- specfile macros.
-#	Macro(s) here can be used reliably for reproducible builds.
-#	(Note: Above is the goal, below are the macros under development)
-#
-
-%old_makeinstall \
-    make \\\
-	prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
-	exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
-	bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\
-	sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \\\
-	sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \\\
-	datadir=%{?buildroot:%{buildroot}}%{_datadir} \\\
-	includedir=%{?buildroot:%{buildroot}}%{_includedir} \\\
-	libdir=%{?buildroot:%{buildroot}}%{_libdir} \\\
-	libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \\\
-	localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \\\
-	sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \\\
-	mandir=%{?buildroot:%{buildroot}}%{_mandir} \\\
-	infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
-    install
-
-
-#------------------------------------------------------------------------------
-# Useful python macros
-%pyver	%(python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".")
-
-#------------------------------------------------------------------------------
-# Useful perl macros 
-# (initially from Artur Frysiak <wiget at t17.ds.pwr.wroc.pl>)
-# (modified by Pixel <pixel at mandriva.com>)
-#
-#	[...]
-#	Group: Development/Perl
-#	[...]
-#	%build
-#	perl Makefile.PL INSTALLDIRS=vendor
-#	%make
-#	[...]
-#	%install
-#	rm -rf $RPM_BUILD_ROOT
-#	make install PREFIX="$RPM_BUILD_ROOT/%{prefix}"
-#	[...]
-#	%files
-#	%defattr(644,root,root,755)
-#	%{perl_vendorlib}/CGI
-# or
-#	%{perl_vendorarch}/DBI
-#	%{perl_vendorarch}/auto/DBI
-#	%{_mandir}/*/*
-#
-
-
-%perl_convert_version() %(perl -Mversion -le '
-	$x = "%{1}";
-	$y = $x;
-	$x =~ s/[[:alpha:]]*$//;
-	$y =~ s/^$x//;
-	$x =~ s/\D*$//;
-	$v = version->new($x)->normal;
-	$v =~ s/^v//;
-	print "$v$y";
-')
-
-# kept for compatibility, but should not be used, especially the ugly perl_archlib!
-%perl_sitearch	%(eval "`perl -V:installsitearch`"; echo $installsitearch)
-%perl_archlib	%(eval "`perl -V:installarchlib`"; echo $installarchlib)
-
-#--------------------------------------------------------------------------------
-# Macro from conectiva
-
-%rename() \
-Obsoletes: %{1} < %{version}-%{release} \
-Provides: %{1} = %{version}-%{release}
-
-# Shorthand for %{defined with_...}
-# macros provided by rpm 4.4, but buggy :(
-%_with() %{expand: %%{?_with_%1:1} %%{!?_with_%1: %%{?_without_%1:0} %%{!?_without_%1: %%{?with_%1:%%{with_%1}} %%{!?with_%1: %%{?without_%1:!%%{without_%1}} %%{!?without_%1: %%{?2:%%2} %%{!?2:1} } } } } }
-%_without() !%{expand: %%{with %1 %{?2:%2}}}
-
-%_package_i18n(g:f:) \
-%%package -n %{?1:%{1}}%{?!1:%{name}}-i18n\
-Summary: Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
-License: %{license}\
-Group: %{?-g:%{-g*}}%{?!-g:%{group}}\
-\
-%%description -n %{?1:%{1}}%{?!1:%{name}}-i18n\
-Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
-\
-%%files -n %{?1:%{1}}%{?!1:%{name}}-i18n %{?-f:%{-f}}%{?!-f:-f %{?1:%{1}}%{?!1:%{name}}.lang}\
-%{nil}
-
-
-#------------------------------------------------------------------------------
-# Python specific macros
-
-# (from rpm 4.4.6)
-%python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
-%python_sitelib	%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%python_version	%(%{__python} -c "import sys; print(sys.version[0:3])")
-
-# More Python specific macro definitions (originally from PLD).
-#
-%py_ver                 %(python -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)
-%py_prefix              %(python -c "import sys; print sys.prefix" 2>/dev/null || echo PYTHON-NOT-FOUND)
-# backward compatibility
-%py_libdir              %py_purelibdir
-%py_platlibdir          %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
-%py_purelibdir          %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=0)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
-%py_incdir              %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()' 2>/dev/null || echo PYTHON-INCLUDEDIR-NOT-FOUND)
-%py_sitedir             %py_puresitedir
-%py_platsitedir         %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
-%py_puresitedir         %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
-
-%py_compile(O)  \
-find %1 -name '*.pyc' -exec rm -f {} \\; \
-python -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
-%{-O: \
-find %1 -name '*.pyo' -exec rm -f {} \\; \
-python -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
-}
-%py_requires(d) \
-BuildRequires: python %{-d:python-devel}
-
-
-#------------------------------------------------------------------------------
-# Ocaml macro
-#
-
-%ocaml_sitelib %(if [ -x /usr/bin/ocamlc ]; then ocamlc -where;fi)/site-lib
-
-#------------------------------------------------------------------------------
-# Ruby gem macros
-#
-
-%__gem_helper @RPMVENDORDIR@/gem_helper.rb
-
-%gem_build(f:j:) \
-	%__gem_helper build \\\
-	%{-f:-f%{-f*}} \\\
-	%{!-j:%{_smp_mflags}}%{-j:-j%{-j*}}
-
-%gem_install(i:n:C) \
-	DESTDIR=${DESTDIR:-%{buildroot}} \\\
-	%__gem_helper install \\\
-	--env-shebang --rdoc --ri --force --ignore-dependencies \\\
-	%{!-i:--install-dir %{buildroot}%{ruby_gemdir}}%{-i:--install-dir %{-i*}} \\\
-	%{!-n:--bindir %{buildroot}%{_bindir}}%{-n:--bindir%{-n*}} \\\
-	%{!-C:--fix-permissions}
-
-#------------------------------------------------------------------------------
-# Redefine RPM sections to allow jumping over them using "--without <section>".
-# This an interesting alternative to --short-circuit.
-# The following are mostly equivalent:
-# % rpmbuild -bi --short-circuit foo.spec && rpmbuild -bb --short-circuit foo.spec
-# % rpmbuild -bb --without build foo.spec
-
-%prep %%prep \
-[ %{_with prep} -eq 1 ] || exit 0 \
-[ %{_with build} -eq 1 ] || exit 0 \
-[ %{_with install} -eq 1 ] || exit 0 \
-%{nil}
-
-%build %%build \
-[ %{_with install} -eq 1 ] || exit 0 \
-[ %{_with build} -eq 1 ] || exit 0 \
-%{nil}
-
-%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package_and_restore}}}\
-%%install\
-[ %{_with install} -eq 1 ] || exit 0 \
-%{nil}
-
-%check %%check \
-[ %{_with check} -eq 1 ] || exit 0 \
-%{nil}

Copied: rpm/rpm-setup/tags/1.116/build.macros.in (from rev 423, rpm/rpm-setup/trunk/build.macros.in)
===================================================================
--- rpm/rpm-setup/tags/1.116/build.macros.in	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/build.macros.in	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,475 @@
+
+%__gzip			/usr/bin/gzip
+
+%_sys_macros_dir @RPMSYSCONFDIR@/macros.d
+%build_sysmacrospath() %{_sys_macros_dir}/%{?1:%{1}}%{?!1:%{name}}.macros
+
+# [Pixel, Dec 2008] deprecated, to remove as soon as rpm 4.6.0 dust settles down
+%defaultbuildroot  %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+
+# when %_with_git_repository is set, these macros modify the behaviour of "%prep" step:
+%_after_setup %{?_with_git_repository:GIT_URL="%{?git_url}" GIT_REPOSITORY_CACHE=%{?git_repository_cache} @RPMVENDORDIR@/git-repository--after-tarball}
+%_patch %{?_with_git_repository:PKG_NAME=%{name} @RPMVENDORDIR@/git-repository--apply-patch}%{?!_with_git_repository:%__patch -U}
+
+# used by "git-repository--after-tarball":
+%git_repository_cache %_topdir/%{name}.git
+
+
+# Various programs used in rpm scripts
+%_update_desktop_database_bin %{_bindir}/update-desktop-database
+%_update_mime_database_bin %{_bindir}/update-mime-database
+%_update_icon_cache_bin %{_bindir}/gtk-update-icon-cache
+%_gconftool_bin %{_bindir}/gconftool-2
+%_scrollkeeper_bin %{_bindir}/scrollkeeper-update
+
+%__service          /sbin/service
+%__chkconfig        /sbin/chkconfig
+
+#==============================================================================
+# ---- Required rpmrc macros.
+#	Macros that used to be initialized as a side effect of rpmrc parsing.
+#	These are the default values that can be overridden by other
+#	(e.g. per-platform, per-system, per-packager, per-package) macros.
+#
+
+%debug_package_and_restore %{debug_package} \
+%package __restore__\
+Summary: %{summary}\
+Group: %{group}\
+%description __restore__
+
+%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon k6
+
+%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
+%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
+
+#	Multilibs
+%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
+
+%_arch_tag_suffix (%_lib)
+%arch_tagged() %{1}%{_arch_tag_suffix} %{?2:%{2} %{3}%{?!3:%{error:undefined 3rd argument in arch_tagged}}}
+
+# Games macros
+%_gamesdir	games
+%_gamesbindir   %{_prefix}/%{_gamesdir}
+%_gamesdatadir  %{_datadir}/%{_gamesdir}
+
+# Menu directories
+%_menudir %{_prefix}/lib/menu
+%_iconsdir %{_datadir}/icons
+%_miconsdir %{_datadir}/icons/mini
+%_liconsdir %{_datadir}/icons/large
+
+%_xfontdir %_datadir/fonts
+
+%_webconfdir %{_sysconfdir}/httpd/conf
+%_webappconfdir %_webconfdir/webapps.d
+# compatibility
+%webappconfdir %_webappconfdir
+
+#==============================================================================
+# ---- Build configuration macros.
+#
+# Package version macro.
+#	The type of package to produce, for compatibility with legacy
+#	versions of rpm.
+#
+# Script gets packaged file list on input.
+# Returns list of multiarch files that are not marked as such,
+# i.e. files in $RPM_BUILD_ROOT that have arch-dependent values
+#
+# Note: Disable (by commenting out) for legacy compatibility.
+#%__check_multiarch_files @RPMLIBDIR@/check-multiarch-files %{buildroot}
+
+# Use internal dependency generator rather than external helpers?
+%_use_internal_dependency_generator	0
+
+%__find_provides	@RPMVENDORDIR@/filter.sh '%{?_provides_exceptions:%{_provides_exceptions}}%{!?_provides_exceptions: }' '%{?_exclude_files_from_autoprov:%{_exclude_files_from_autoprov}}%{!?_exclude_files_from_autoprov: }' '%{buildroot}' @RPMVENDORDIR@/find-provides
+%__find_requires	@RPMVENDORDIR@/filter.sh '%{?_requires_exceptions:%{_requires_exceptions}}%{!?_requires_exceptions: }' '%{?_exclude_files_from_autoreq:%{_exclude_files_from_autoreq}}%{!?_exclude_files_from_autoreq: }' '%{buildroot}' @RPMVENDORDIR@/find-requires %{?buildroot:%{buildroot}} %{?_target_cpu:%{_target_cpu}}
+
+%find_lang  @RPMVENDORDIR@/find-lang.pl %{buildroot}
+
+# stuff below has been deprecated by rpm filetriggers [June 2008]
+%update_menus %{nil}
+%clean_menus %{nil}
+%update_desktop_database %{nil}
+%clean_desktop_database %{nil}
+%update_mime_database %{nil}
+%clean_mime_database %{nil}
+%update_scrollkeeper %{nil}
+%clean_scrollkeeper %{nil}
+
+# Update Menu
+%_update_menus_bin %{_bindir}/update-menus
+
+# Update Window Managers session.
+%_fndsession_bin %{_sbindir}/fndSession
+%make_session %{nil}
+%make_dm_session if [ -x %{_fndsession_bin} ]; then %{_fndsession_bin} || true ; fi \
+%{nil}
+
+# For rebuilding gcj-db
+%_rebuildgcjdb_bin %{_bindir}/rebuild-gcj-db
+%update_gcjdb if [ -x %{_rebuildgcjdb_bin} ]; then %{_rebuildgcjdb_bin} || true ; fi \
+%{nil}
+
+%clean_gcjdb if [ -x %{_rebuildgcjdb_bin} ]; then %{_rebuildgcjdb_bin} || true ; fi \
+%{nil}
+
+# Rebuild icon cache
+#
+# following themes are handled through filetriggers:
+%icon_cache_through_filetrigger_hicolor 1
+%icon_cache_through_filetrigger_gnome 1
+%icon_cache_through_filetrigger_oxygen 1
+
+%update_icon_cache() %{expand: %%{!?icon_cache_through_filetrigger_%1:if [ -x %%{_update_icon_cache_bin} ]; then \
+%%{_update_icon_cache_bin} --force --quiet %%{_iconsdir}/%%{1} || true; fi \
+%%{nil}}}
+
+%clean_icon_cache() %{expand: %%{!?icon_cache_through_filetrigger_%1:if [ -x %%{_update_icon_cache_bin} -a -r %%{_iconsdir}/%%{1}/index.theme ]; then \
+%%{_update_icon_cache_bin} --force --quiet %%{_iconsdir}/%%{1} || true ; fi \
+%%{nil}}}
+
+# GConf schemas:
+# installation is handled by filetriggers
+%post_install_gconf_schemas() %{nil}
+# but uninstall still need to be done in %preun:
+%preun_uninstall_gconf_schemas() if [ "$1" = "0" -a -x %{_gconftool_bin} ]; then \
+SCHEMAS="" \
+for SCHEMA in %{*} ; do \
+  SCHEMAS="$SCHEMAS %{_sysconfdir}/gconf/schemas/$SCHEMA.schemas" \
+done \
+GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} --makefile-uninstall-rule  $SCHEMAS > /dev/null || true ; fi \
+%{nil}
+
+# Mageia Linux version
+# - "9.1"    =>  910
+# - "10.2.2" => 1022
+# (user may copy the following line in specfile)
+%mgaversion		%(perl -pe '/(\\d+)\\.(\\d)\\.?(\\d)?/; $_="$1$2".($3||0)' /etc/release)
+
+%distsuffix .mga
+
+%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release}
+
+#------------------------------------------------------------------------------
+# definions merged from manbo-setup-build
+#
+%_enable_debug_packages 1
+
+# Default extension to use (for info files)
+%_extension .xz
+
+%__install_info /sbin/install-info
+
+%_install_info() if [[ -f %{_infodir}/%{1}%{_extension} ]]; then %{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir; fi \
+%{nil}
+# (nb: keep the "alone on its line ';'")
+%_remove_install_info() if [ "$1" = "0" ]; then if [[ -f %{_infodir}/%{1}%{_extension} ]]; then %{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir --remove ; fi; fi \
+%{nil}
+
+
+# Macro: %{mklibname <name> [<major> [<minor>]] [-s] [-d]}
+# - %{mklibname test}               => lib64test, on a lib64 platform
+# - %{mklibname test 1 -d}      => libtest1-devel
+# - %{mklibname test 1 -d 0 -s} => libtest1_0-static-devel
+%mklibname(ds)  %{_lib}%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}
+
+# Dynamic EVRD tags macro for use with versioned provides/requires in place of
+# '%{version}-%{release}', ie. to automatically add distepoch or epoch if present
+%EVRD		%{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}}%{?distepoch::%{distepoch}}
+
+%debugcflags %{?_enable_debug_packages:-g}
+
+# common compilation flags
+
+%_fortify_cflags -Wp,-D_FORTIFY_SOURCE=2
+
+# cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments
+%Werror_cflags -Wformat -Werror=format-security
+
+%_ssp_cflags -fstack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
+%__common_cflags -O2 %{debugcflags} -pipe %{Werror_cflags} %{?_fortify_cflags}
+%__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags}
+
+# Servers opt flags.
+# Also set the env variables for backward compatibility (mdv #32050).
+%serverbuild %define _serverbuild_flags -fstack-protector-all \
+export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%optflags" \
+%{nil}
+
+
+%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
+	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
+	[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
+
+%_make_bin make
+%make %{_make_bin} %_smp_mflags
+
+%makeinstall_std make DESTDIR=%{?buildroot:%{buildroot}} install
+
+%__fix_libtool_ltmain_from_overlinking @RPMVENDORDIR@/fix-libtool-ltmain-from-overlinking
+%__fix_libtool_from_moving_options_after_libs @RPMVENDORDIR@/fix-libtool-from-moving-options-after-libs
+%__fix_dlsearch_path_in_libtool_for_multilib @RPMVENDORDIR@/fix-dlsearch-path-in-libtool-for-multilib
+
+%__cputoolize cputoolize
+
+%__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ ! -f configure.in -a ! -f configure.ac ] || %{__libtoolize} --copy --force)}
+
+%ldflags %{?!_disable_ld_as_needed: -Wl,--as-needed}%{?!_disable_ld_no_undefined: -Wl,--no-undefined}%{?!_disable_ld_relro: -Wl,-z,relro}%{?!_disable_ld_O1: -Wl,-O1}%{?!_disable_ld_build_id: -Wl,--build-id}%{?!_disable_ld_enable_new_dtags: -Wl,--enable-new-dtags}
+
+%setup_compile_flags \
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+  %(if [ -n '%ldflags' ]; then echo 'LDFLAGS="$LDFLAGS%ldflags"; export LDFLAGS ;'; fi)
+
+%before_configure \
+  %setup_compile_flags \
+  CONFIGURE_TOP="${CONFIGURE_TOP:-.}"; \
+  %{?!_disable_ld_as_needed:@RPMVENDORDIR@/force-as-needed-for-shared-lib-in-libtool ;} \
+  %{?!_disable_ld_no_undefined:@RPMVENDORDIR@/drop-ld-no-undefined-for-shared-lib-modules-in-libtool ;} \
+  %{__fix_libtool_ltmain_from_overlinking} ; \
+  %{__fix_libtool_from_moving_options_after_libs} $CONFIGURE_TOP ; \
+  %{__fix_dlsearch_path_in_libtool_for_multilib} $CONFIGURE_TOP %{_lib}
+
+# This is an improved version of %configure (from PLD team).
+%configure \
+  %before_configure ; \
+  %{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
+  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
+  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
+  $CONFIGURE_TOP/configure %{_target_platform} \\\
+	--program-prefix=%{?_program_prefix} \\\
+ 	--prefix=%{_prefix} \\\
+	--exec-prefix=%{_exec_prefix} \\\
+	--bindir=%{_bindir} \\\
+	--sbindir=%{_sbindir} \\\
+	--sysconfdir=%{_sysconfdir} \\\
+	--datadir=%{_datadir} \\\
+	--includedir=%{_includedir} \\\
+	--libdir=%{_libdir} \\\
+	--libexecdir=%{_libexecdir} \\\
+	--localstatedir=%{_localstatedir} \\\
+	--sharedstatedir=%{_sharedstatedir} \\\
+	--mandir=%{_mandir} \\\
+	--infodir=%{_infodir} \\\
+    $CONFIGURE_XPATH
+
+%configure2_5x \
+  %before_configure ; \
+  %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
+  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
+  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
+  $CONFIGURE_TOP/configure --build=%{_target_platform} \\\
+ 	--prefix=%{_prefix} \\\
+	--exec-prefix=%{_exec_prefix} \\\
+	--bindir=%{_bindir} \\\
+	--sbindir=%{_sbindir} \\\
+	--sysconfdir=%{_sysconfdir} \\\
+	--datadir=%{_datadir} \\\
+	--includedir=%{_includedir} \\\
+	--libdir=%{_libdir} \\\
+	--libexecdir=%{_libexecdir} \\\
+	--localstatedir=%{_localstatedir} \\\
+	--sharedstatedir=%{_sharedstatedir} \\\
+	--mandir=%{_mandir} \\\
+	--infodir=%{_infodir} \\\
+    $CONFIGURE_XPATH
+
+
+#==============================================================================
+# ---- Build policy macros.
+#
+#---------------------------------------------------------------------
+#   Expanded at end of %install scriptlet.
+#
+
+%__os_install_post    \
+    %{?__spec_helper_post}%{?!__spec_helper_post:/usr/share/spec-helper/spec-helper} \
+%{nil}
+
+%__debug_install_post   \
+   @RPMVENDORDIR@/find-debuginfo.sh "%{_builddir}/%{?buildsubdir}"\
+%{nil}
+
+
+#==============================================================================
+# ---- specfile macros.
+#	Macro(s) here can be used reliably for reproducible builds.
+#	(Note: Above is the goal, below are the macros under development)
+#
+
+%old_makeinstall \
+    make \\\
+	prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
+	exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
+	bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\
+	sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \\\
+	sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \\\
+	datadir=%{?buildroot:%{buildroot}}%{_datadir} \\\
+	includedir=%{?buildroot:%{buildroot}}%{_includedir} \\\
+	libdir=%{?buildroot:%{buildroot}}%{_libdir} \\\
+	libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \\\
+	localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \\\
+	sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \\\
+	mandir=%{?buildroot:%{buildroot}}%{_mandir} \\\
+	infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
+    install
+
+
+#------------------------------------------------------------------------------
+# Useful python macros
+%pyver	%(python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".")
+
+#------------------------------------------------------------------------------
+# Useful perl macros 
+# (initially from Artur Frysiak <wiget at t17.ds.pwr.wroc.pl>)
+# (modified by Pixel <pixel at mandriva.com>)
+#
+#	[...]
+#	Group: Development/Perl
+#	[...]
+#	%build
+#	perl Makefile.PL INSTALLDIRS=vendor
+#	%make
+#	[...]
+#	%install
+#	rm -rf $RPM_BUILD_ROOT
+#	make install PREFIX="$RPM_BUILD_ROOT/%{prefix}"
+#	[...]
+#	%files
+#	%defattr(644,root,root,755)
+#	%{perl_vendorlib}/CGI
+# or
+#	%{perl_vendorarch}/DBI
+#	%{perl_vendorarch}/auto/DBI
+#	%{_mandir}/*/*
+#
+
+
+%perl_convert_version() %(perl -Mversion -le '
+	$x = "%{1}";
+	$y = $x;
+	$x =~ s/[[:alpha:]]*$//;
+	$y =~ s/^$x//;
+	$x =~ s/\D*$//;
+	$v = version->new($x)->normal;
+	$v =~ s/^v//;
+	print "$v$y";
+')
+
+# kept for compatibility, but should not be used, especially the ugly perl_archlib!
+%perl_sitearch	%(eval "`perl -V:installsitearch`"; echo $installsitearch)
+%perl_archlib	%(eval "`perl -V:installarchlib`"; echo $installarchlib)
+
+#--------------------------------------------------------------------------------
+# Macro from conectiva
+
+%rename() \
+Obsoletes: %{1} < %{version}-%{release} \
+Provides: %{1} = %{version}-%{release}
+
+# Shorthand for %{defined with_...}
+# macros provided by rpm 4.4, but buggy :(
+%_with() %{expand: %%{?_with_%1:1} %%{!?_with_%1: %%{?_without_%1:0} %%{!?_without_%1: %%{?with_%1:%%{with_%1}} %%{!?with_%1: %%{?without_%1:!%%{without_%1}} %%{!?without_%1: %%{?2:%%2} %%{!?2:1} } } } } }
+%_without() !%{expand: %%{with %1 %{?2:%2}}}
+
+%_package_i18n(g:f:) \
+%%package -n %{?1:%{1}}%{?!1:%{name}}-i18n\
+Summary: Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
+License: %{license}\
+Group: %{?-g:%{-g*}}%{?!-g:%{group}}\
+\
+%%description -n %{?1:%{1}}%{?!1:%{name}}-i18n\
+Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
+\
+%%files -n %{?1:%{1}}%{?!1:%{name}}-i18n %{?-f:%{-f}}%{?!-f:-f %{?1:%{1}}%{?!1:%{name}}.lang}\
+%{nil}
+
+
+#------------------------------------------------------------------------------
+# Python specific macros
+
+# (from rpm 4.4.6)
+%python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+%python_sitelib	%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%python_version	%(%{__python} -c "import sys; print(sys.version[0:3])")
+
+# More Python specific macro definitions (originally from PLD).
+#
+%py_ver                 %(python -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)
+%py_prefix              %(python -c "import sys; print sys.prefix" 2>/dev/null || echo PYTHON-NOT-FOUND)
+# backward compatibility
+%py_libdir              %py_purelibdir
+%py_platlibdir          %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+%py_purelibdir          %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=0)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+%py_incdir              %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()' 2>/dev/null || echo PYTHON-INCLUDEDIR-NOT-FOUND)
+%py_sitedir             %py_puresitedir
+%py_platsitedir         %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+%py_puresitedir         %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+
+%py_compile(O)  \
+find %1 -name '*.pyc' -exec rm -f {} \\; \
+python -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+%{-O: \
+find %1 -name '*.pyo' -exec rm -f {} \\; \
+python -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+}
+%py_requires(d) \
+BuildRequires: python %{-d:python-devel}
+
+
+#------------------------------------------------------------------------------
+# Ocaml macro
+#
+
+%ocaml_sitelib %(if [ -x /usr/bin/ocamlc ]; then ocamlc -where;fi)/site-lib
+
+#------------------------------------------------------------------------------
+# Ruby gem macros
+#
+
+%__gem_helper @RPMVENDORDIR@/gem_helper.rb
+
+%gem_build(f:j:) \
+	%__gem_helper build \\\
+	%{-f:-f%{-f*}} \\\
+	%{!-j:%{_smp_mflags}}%{-j:-j%{-j*}}
+
+%gem_install(i:n:C) \
+	DESTDIR=${DESTDIR:-%{buildroot}} \\\
+	%__gem_helper install \\\
+	--env-shebang --rdoc --ri --force --ignore-dependencies \\\
+	%{!-i:--install-dir %{buildroot}%{ruby_gemdir}}%{-i:--install-dir %{-i*}} \\\
+	%{!-n:--bindir %{buildroot}%{_bindir}}%{-n:--bindir%{-n*}} \\\
+	%{!-C:--fix-permissions}
+
+#------------------------------------------------------------------------------
+# Redefine RPM sections to allow jumping over them using "--without <section>".
+# This an interesting alternative to --short-circuit.
+# The following are mostly equivalent:
+# % rpmbuild -bi --short-circuit foo.spec && rpmbuild -bb --short-circuit foo.spec
+# % rpmbuild -bb --without build foo.spec
+
+%prep %%prep \
+[ %{_with prep} -eq 1 ] || exit 0 \
+[ %{_with build} -eq 1 ] || exit 0 \
+[ %{_with install} -eq 1 ] || exit 0 \
+%{nil}
+
+%build %%build \
+[ %{_with install} -eq 1 ] || exit 0 \
+[ %{_with build} -eq 1 ] || exit 0 \
+%{nil}
+
+%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package_and_restore}}}\
+%%install\
+[ %{_with install} -eq 1 ] || exit 0 \
+%{nil}
+
+%check %%check \
+[ %{_with check} -eq 1 ] || exit 0 \
+%{nil}

Deleted: rpm/rpm-setup/tags/1.116/configure.ac
===================================================================
--- rpm/rpm-setup/trunk/configure.ac	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/tags/1.116/configure.ac	2011-02-05 22:13:37 UTC (rev 430)
@@ -1,168 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
-
-AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 1.115, nanardon at mageia.org)
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(1.9 -Wno-portability)
-AC_CONFIG_SRCDIR
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_CONFIG_FILES([
-                 Makefile
-                 ])
-
-dnl See if we have pkgconfig for rpm, resort to old behavior if not
-PKG_CHECK_MODULES([RPM], [rpm], [
-      AC_DEFINE_UNQUOTED([HAVE_RPM],1,[Define if RPM backend is available])
-      CPPFLAGS="$RPM_CFLAGS $CPPFLAGS"
-      LDFLAGS="$RPM_LIBS $LDFLAGS"
-   ], [
-      AC_PATH_PROG(RPM_PATH,rpm,none)
-      if test "$RPM_PATH" = "none"; then
-         AC_MSG_ERROR([RPM executable was not found in your system])
-      else
-         AC_DEFINE_UNQUOTED([HAVE_RPM],1,[Define if RPM backend is available])
-      fi
-   ]
-)
-
-AC_CHECK_LIB([rpmio], [rpmLoadMacroFile])
-AC_HEADER_STDC
-AC_CHECK_HEADERS([string.h rpm/rpmmacro.h rpm/rpmlib.h rpm/rpmio.h rpm/rpmtag.h])
-
-CANONTARGETCPU=${target_cpu}
-CANONTARGETGNU=-gnu
-
-case "${target_cpu}" in
-    *86|athlon|k6|pentium*) 
-    RPMALLARCH="i386 i486 i586 i686 k6 athlon pentium3 pentium4"
-    CANONTARGETCPU=i586
-    ;;
-    x86_64|amd64)
-    RPMALLARCH="i386 i486 i586 i686 k6 athlon pentium3 pentium4 amd64 x86_64"
-    CANONTARGETCPU=x86_64
-    CANONTARGETCPU32=i586
-    ;;
-    ppc|powerpc)
-    RPMALLARCH="ppc"
-    CANONTARGETCPU=ppc
-    ;;
-    ppc64|powerpc64)
-    RPMALLARCH="ppc ppc32 ppc64"
-    CANONTARGETCPU=ppc64
-    ;;
-    sparc|sparcv9)
-    RPMALLARCH="sparc"
-    CANONTARGETCPU=sparc
-    ;;
-    sparc64)
-    RPMALLARCH="sparc sparc64"
-    CANONTARGETCPU=sparc64
-    ;;
-    mipsel)
-    RPMALLARCH="mipsel mips32el mips64el"
-    CANONTARGETCPU=mipsel
-    ;;
-    armv4tl)
-    RPMALLARCH="arml armv4tl"
-    CANONTARGETCPU=armv4tl
-    CANONTARGETGNU=-gnueabi
-    ;;
-    armv5tl)
-    RPMALLARCH="arml armv4tl armv5tl"
-    CANONTARGETCPU=armv5tl
-    CANONTARGETGNU=-gnueabi
-    ;;
-    # some armv5te cpu have buggy instruction so better disable
-    # the "e" extension
-    armv5tel)
-    RPMALLARCH="arml armv4tl armv5tel armv5tl"
-    CANONTARGETCPU=armv5tl
-    CANONTARGETGNU=-gnueabi
-    ;;
-    armv7l)
-    RPMALLARCH="arml armv4tl armv5tl armv5tel armv7l"
-    CANONTARGETCPU=armv7l
-    CANONTARGETGNU=-gnueabi
-esac
-RPMALLARCH="${RPMALLARCH} noarch"
-AC_SUBST(RPMALLARCH)
-AC_SUBST(CANONTARGETCPU)
-AC_SUBST(CANONTARGETCPU32)
-AC_SUBST(CANONTARGETGNU)
-
-#
-# get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os
-#
-if echo "$build_os" | grep '.*-gnulibc1' > /dev/null ; then
-    build_os=`echo "${build_os}" | sed 's/-gnulibc1$//'`
-fi
-if echo "$build_os" | grep '.*-gnu' > /dev/null ; then
-    build_os=`echo "${build_os}" | sed 's/-gnu$//'`
-fi
-
-changequote(<, >)
-build_os_exact="${build_os}"
-build_os_major=`echo "${build_os}" | sed 's/\..*$//'`
-build_os_noversion=`echo "${build_os}" | sed 's/[0-9]*\..*$//'`
-changequote([, ])
-
-dnl Find our os
-RPMOS="$build_os_noversion"
-AC_SUBST(RPMOS)
-
-# Checks for library functions.
-RPMVENDOR="Mageia"
-AC_ARG_WITH(vendor, [  --with-vendor            the vendor of this config  ])
-if test $with_vendor; then
-    RPMVENDOR=$with_vendor
-fi
-AC_SUBST(RPMVENDOR)
-
-RPMCANONVENDOR=`echo "${RPMVENDOR}" | tr [A-Z] [a-z]`
-AC_SUBST(RPMCANONVENDOR)
-
-if test X"$prefix" = XNONE ; then
-    usrprefix="$ac_default_prefix"
-else
-    usrprefix=$prefix
-fi
-
-RPMLIBDIR="${usrprefix}/lib/rpm"
-AC_ARG_WITH(rpmlibdir, [  --with-rpmlibdir=dir    location of rpm config file ])
-if test $with_rpmlibdir; then
-    RPMLIBDIR=$with_rpmlibdir
-fi
-AC_SUBST(RPMLIBDIR)
-
-RPMCONFDIR=${RPMLIBDIR}
-AC_ARG_WITH(rpmconfdir, [  --with-rpmconfdir=dir    location of our config ])
-if test $with_rpmconfdir; then
-    RPMCONFDIR=$with_rpmconfdir
-fi
-AC_SUBST(RPMCONFDIR)
-
-RPMVENDORDIR="${RPMCONFDIR}/${RPMCANONVENDOR}"
-AC_SUBST(RPMVENDORDIR)
-
-RPMSYSCONFDIR="/etc/rpm"
-AC_ARG_WITH(rpmsysconfdir, [  --with-rpmsysconfdir=dir location of etc ])
-if test $with_rpmsysconfdir; then
-    RPMSYSCONFDIR=$with_rpmsysconfdir
-fi
-AC_SUBST(RPMSYSCONFDIR)
-
-
-AC_ARG_WITH(rpmplatform, [  --with-rpmplatform		use /etc/rpm/platform ])
-AM_CONDITIONAL([RPMPLATFORM],[test $with_rpmplatform])
-
-AC_ARG_WITH(only-rpmrc, [  --with-only-rpmrc		rpm uses rpmrc ])
-AM_CONDITIONAL([ONLY_RPMRC],[test $with_only_rpmrc])
-
-AC_OUTPUT

Copied: rpm/rpm-setup/tags/1.116/configure.ac (from rev 421, rpm/rpm-setup/trunk/configure.ac)
===================================================================
--- rpm/rpm-setup/tags/1.116/configure.ac	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/configure.ac	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,168 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+# $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $
+
+AC_PREREQ(2.59)
+AC_INIT(rpm-mageia-setup, 1.116, tmb at mageia.org)
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE(1.9 -Wno-portability)
+AC_CONFIG_SRCDIR
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_CONFIG_FILES([
+                 Makefile
+                 ])
+
+dnl See if we have pkgconfig for rpm, resort to old behavior if not
+PKG_CHECK_MODULES([RPM], [rpm], [
+      AC_DEFINE_UNQUOTED([HAVE_RPM],1,[Define if RPM backend is available])
+      CPPFLAGS="$RPM_CFLAGS $CPPFLAGS"
+      LDFLAGS="$RPM_LIBS $LDFLAGS"
+   ], [
+      AC_PATH_PROG(RPM_PATH,rpm,none)
+      if test "$RPM_PATH" = "none"; then
+         AC_MSG_ERROR([RPM executable was not found in your system])
+      else
+         AC_DEFINE_UNQUOTED([HAVE_RPM],1,[Define if RPM backend is available])
+      fi
+   ]
+)
+
+AC_CHECK_LIB([rpmio], [rpmLoadMacroFile])
+AC_HEADER_STDC
+AC_CHECK_HEADERS([string.h rpm/rpmmacro.h rpm/rpmlib.h rpm/rpmio.h rpm/rpmtag.h])
+
+CANONTARGETCPU=${target_cpu}
+CANONTARGETGNU=-gnu
+
+case "${target_cpu}" in
+    *86|athlon|k6|pentium*) 
+    RPMALLARCH="i386 i486 i586 i686 k6 athlon pentium3 pentium4"
+    CANONTARGETCPU=i586
+    ;;
+    x86_64|amd64)
+    RPMALLARCH="i386 i486 i586 i686 k6 athlon pentium3 pentium4 amd64 x86_64"
+    CANONTARGETCPU=x86_64
+    CANONTARGETCPU32=i586
+    ;;
+    ppc|powerpc)
+    RPMALLARCH="ppc"
+    CANONTARGETCPU=ppc
+    ;;
+    ppc64|powerpc64)
+    RPMALLARCH="ppc ppc32 ppc64"
+    CANONTARGETCPU=ppc64
+    ;;
+    sparc|sparcv9)
+    RPMALLARCH="sparc"
+    CANONTARGETCPU=sparc
+    ;;
+    sparc64)
+    RPMALLARCH="sparc sparc64"
+    CANONTARGETCPU=sparc64
+    ;;
+    mipsel)
+    RPMALLARCH="mipsel mips32el mips64el"
+    CANONTARGETCPU=mipsel
+    ;;
+    armv4tl)
+    RPMALLARCH="arml armv4tl"
+    CANONTARGETCPU=armv4tl
+    CANONTARGETGNU=-gnueabi
+    ;;
+    armv5tl)
+    RPMALLARCH="arml armv4tl armv5tl"
+    CANONTARGETCPU=armv5tl
+    CANONTARGETGNU=-gnueabi
+    ;;
+    # some armv5te cpu have buggy instruction so better disable
+    # the "e" extension
+    armv5tel)
+    RPMALLARCH="arml armv4tl armv5tel armv5tl"
+    CANONTARGETCPU=armv5tl
+    CANONTARGETGNU=-gnueabi
+    ;;
+    armv7l)
+    RPMALLARCH="arml armv4tl armv5tl armv5tel armv7l"
+    CANONTARGETCPU=armv7l
+    CANONTARGETGNU=-gnueabi
+esac
+RPMALLARCH="${RPMALLARCH} noarch"
+AC_SUBST(RPMALLARCH)
+AC_SUBST(CANONTARGETCPU)
+AC_SUBST(CANONTARGETCPU32)
+AC_SUBST(CANONTARGETGNU)
+
+#
+# get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os
+#
+if echo "$build_os" | grep '.*-gnulibc1' > /dev/null ; then
+    build_os=`echo "${build_os}" | sed 's/-gnulibc1$//'`
+fi
+if echo "$build_os" | grep '.*-gnu' > /dev/null ; then
+    build_os=`echo "${build_os}" | sed 's/-gnu$//'`
+fi
+
+changequote(<, >)
+build_os_exact="${build_os}"
+build_os_major=`echo "${build_os}" | sed 's/\..*$//'`
+build_os_noversion=`echo "${build_os}" | sed 's/[0-9]*\..*$//'`
+changequote([, ])
+
+dnl Find our os
+RPMOS="$build_os_noversion"
+AC_SUBST(RPMOS)
+
+# Checks for library functions.
+RPMVENDOR="Mageia"
+AC_ARG_WITH(vendor, [  --with-vendor            the vendor of this config  ])
+if test $with_vendor; then
+    RPMVENDOR=$with_vendor
+fi
+AC_SUBST(RPMVENDOR)
+
+RPMCANONVENDOR=`echo "${RPMVENDOR}" | tr [A-Z] [a-z]`
+AC_SUBST(RPMCANONVENDOR)
+
+if test X"$prefix" = XNONE ; then
+    usrprefix="$ac_default_prefix"
+else
+    usrprefix=$prefix
+fi
+
+RPMLIBDIR="${usrprefix}/lib/rpm"
+AC_ARG_WITH(rpmlibdir, [  --with-rpmlibdir=dir    location of rpm config file ])
+if test $with_rpmlibdir; then
+    RPMLIBDIR=$with_rpmlibdir
+fi
+AC_SUBST(RPMLIBDIR)
+
+RPMCONFDIR=${RPMLIBDIR}
+AC_ARG_WITH(rpmconfdir, [  --with-rpmconfdir=dir    location of our config ])
+if test $with_rpmconfdir; then
+    RPMCONFDIR=$with_rpmconfdir
+fi
+AC_SUBST(RPMCONFDIR)
+
+RPMVENDORDIR="${RPMCONFDIR}/${RPMCANONVENDOR}"
+AC_SUBST(RPMVENDORDIR)
+
+RPMSYSCONFDIR="/etc/rpm"
+AC_ARG_WITH(rpmsysconfdir, [  --with-rpmsysconfdir=dir location of etc ])
+if test $with_rpmsysconfdir; then
+    RPMSYSCONFDIR=$with_rpmsysconfdir
+fi
+AC_SUBST(RPMSYSCONFDIR)
+
+
+AC_ARG_WITH(rpmplatform, [  --with-rpmplatform		use /etc/rpm/platform ])
+AM_CONDITIONAL([RPMPLATFORM],[test $with_rpmplatform])
+
+AC_ARG_WITH(only-rpmrc, [  --with-only-rpmrc		rpm uses rpmrc ])
+AM_CONDITIONAL([ONLY_RPMRC],[test $with_only_rpmrc])
+
+AC_OUTPUT

Copied: rpm/rpm-setup/tags/1.116/drop-ld-no-undefined-for-shared-lib-modules-in-libtool (from rev 425, rpm/rpm-setup/trunk/drop-ld-no-undefined-for-shared-lib-modules-in-libtool)
===================================================================
--- rpm/rpm-setup/tags/1.116/drop-ld-no-undefined-for-shared-lib-modules-in-libtool	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/drop-ld-no-undefined-for-shared-lib-modules-in-libtool	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,47 @@
+#!/usr/bin/perl
+
+# applies patch:
+# --- ltmain.sh.pix       2008-05-23 13:51:52.000000000 +0200
+# +++ ltmain.sh   2008-05-23 13:52:16.000000000 +0200
+# @@ -1948,6 +1948,11 @@
+#        fi
+#      done # argument parsing loop
+#  
+# +    if test "$module" = yes ; then
+# +       # [Manbo-labs] dropping ld option "--no-undefined" which is wrong for plugins
+# +       linker_flags=`echo "X $linker_flags" | $Xsed -e 's/ --no-undefined//'`
+# +       compiler_flags=`echo "X $compiler_flags" | $Xsed -e 's/ -Wl,--no-undefined//'`
+# +    fi
+# +
+#      if test -n "$prev"; then
+#        $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+#        $echo "$help" 1>&2
+
+# a similar patch has been applied in ltmain.sh in libtool package
+# but this works even if autoreconf is not called
+
+foreach my $ltmain ('ltmain.sh', glob("*/ltmain.sh")) {
+    open(my $F, '<', $ltmain) or next;
+
+    print "Modifying $ltmain underlinking for plugins (cf http://wiki.mandriva.com/en/Underlinking)\n";
+
+    open(my $G, '>', "$ltmain.new") or exit;
+    while (<$F>) {
+	print $G $_;
+
+	if ($_ eq "    done # argument parsing loop\n") {
+	    $modified = 1;
+	    print $G <<'EOF';
+
+    if test "$module" = yes ; then
+    	linker_flags=`echo "X $linker_flags" | $Xsed -e 's/ --no-undefined//'`
+    	compiler_flags=`echo "X $compiler_flags" | $Xsed -e 's/ -Wl,--no-undefined//'`
+    fi
+EOF
+	}
+    }
+
+    rename $ltmain, "$ltmain.drop" 
+      and rename "$ltmain.new", $ltmain or print STDERR "modifying $ltmain failed: $!\n";
+}
+

Copied: rpm/rpm-setup/tags/1.116/fix-dlsearch-path-in-libtool-for-multilib (from rev 425, rpm/rpm-setup/trunk/fix-dlsearch-path-in-libtool-for-multilib)
===================================================================
--- rpm/rpm-setup/tags/1.116/fix-dlsearch-path-in-libtool-for-multilib	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/fix-dlsearch-path-in-libtool-for-multilib	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# If configure was generated with libtool that did not have support for
+# run-time library search path (sys_lib_dlsearch_path_spec) autodetection,
+# we replace the hardcoded search path with "/usr/%{_lib} /%{_lib}".
+
+# Our libtool has autodetection in form of lib64.patch, though it does not
+# handle cases (e.g. Debian) where /usr/lib is valid for multilib archs.
+
+# Without the correct search path defined, binaries would wrongly get rpath even
+# when the libraries are located in a standard directory.
+
+CONFIGURE_TOP="${1:-.}"
+LIB="${2:-lib}"
+if [ -e $CONFIGURE_TOP/configure ] && grep -q 'sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"' $CONFIGURE_TOP/configure; then
+  echo "Forcing run-time library search path definition in configure to prevent libtool from adding rpath for standard directories (configure was generated with libtool without support for autodetection)"
+
+  sed -i \
+   -e "s,^[ \t]*# Append ld.so.conf contents to the search path,  sys_lib_dlsearch_path_spec=\"/usr/${LIB} /${LIB}\"\n\0," \
+   -e 's,sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra",sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra",' \
+   $CONFIGURE_TOP/configure
+fi
+

Copied: rpm/rpm-setup/tags/1.116/fix-libtool-from-moving-options-after-libs (from rev 425, rpm/rpm-setup/trunk/fix-libtool-from-moving-options-after-libs)
===================================================================
--- rpm/rpm-setup/tags/1.116/fix-libtool-from-moving-options-after-libs	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/fix-libtool-from-moving-options-after-libs	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+CONFIGURE_TOP="${1:-.}"
+if [ -e $CONFIGURE_TOP/configure ] && grep -q -F '$deplibs $compiler_flags' $CONFIGURE_TOP/configure; then
+  echo "Fixing libtool inside configure to pass -Wl,xxx options before libraries"
+
+  # a similar patch has been applied in libtool in libtool package (#47273)
+  # but this works even if autoreconf is not called
+
+  sed -i \
+   -e 's,$deplibs $compiler_flags,$compiler_flags $deplibs,' \
+   -e 's,$deplibs $postdep_objects $compiler_flags,$compiler_flags $deplibs $postdep_objects,' \
+   $CONFIGURE_TOP/configure
+fi
+

Copied: rpm/rpm-setup/tags/1.116/fix-libtool-ltmain-from-overlinking (from rev 425, rpm/rpm-setup/trunk/fix-libtool-ltmain-from-overlinking)
===================================================================
--- rpm/rpm-setup/tags/1.116/fix-libtool-ltmain-from-overlinking	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/fix-libtool-ltmain-from-overlinking	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ -e ltmain.sh ]; then
+   echo "Fixing libtool's ltmain.sh to prevent overlinking (cf http://wiki.mandriva.com/en/Overlinking)"
+
+   # a similar patch has been applied in ltmain.sh in libtool package
+   # but this works even if autoreconf is not called
+
+   mv ltmain.sh ltmain.sh.orig
+   echo link_all_deplibs=no > ltmain.sh
+   cat ltmain.sh.orig >> ltmain.sh
+   
+   sed -i -s 's/link) libs="$deplibs %DEPLIBS% $dependency_libs"/link) libs="$deplibs %DEPLIBS%"/' ltmain.sh
+fi

Copied: rpm/rpm-setup/tags/1.116/force-as-needed-for-shared-lib-in-libtool (from rev 425, rpm/rpm-setup/trunk/force-as-needed-for-shared-lib-in-libtool)
===================================================================
--- rpm/rpm-setup/tags/1.116/force-as-needed-for-shared-lib-in-libtool	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/force-as-needed-for-shared-lib-in-libtool	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# replaces
+#	  tmp_sharedflag='-shared' ;;
+# with
+# 	  tmp_sharedflag='-shared -Wl,--as-needed' ;;
+#
+# since passing -Wl,--as-needed is not enough because libtool moves it
+# after *.o and libs
+
+if [ -e configure ]; then
+   echo "Forcing -Wl,--as-needed in configure/libtool to workaround libtool bug (cf http://lists.gnu.org/archive/html/libtool-patches/2004-06/msg00002.html)"
+   sed -i "s/^\([ \t]*tmp_sharedflag\)='-shared'/\1='-shared -Wl,--as-needed'/" configure
+fi

Deleted: rpm/rpm-setup/tags/1.116/macros.in
===================================================================
--- rpm/rpm-setup/trunk/macros.in	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/tags/1.116/macros.in	2011-02-05 22:13:37 UTC (rev 430)
@@ -1,56 +0,0 @@
-# @RPMVENDORDIR@/macros:
-# Main Mangeia rpm configuration
-# Only modified macros goes here
-#
-# $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
-# should be added to /etc/rpm/macros, while per-user configuration should
-# be added to ~/.rpmmacros.
-
-%_host_vendor @RPMCANONVENDOR@
-%_real_vendor @RPMCANONVENDOR@
-
-%_vendor @RPMVENDOR@
-
-%_gnu @CANONTARGETGNU@
-%_target_platform	%{_target_cpu}-%{_real_vendor}-%{_target_os}%{?_gnu}
-
-%_host %{_host_cpu}-%{_real_vendor}-%{_host_os}
-
-%_changelog_truncate	3 years ago
-
-# use LZMA to compress binary packages:
-%_binary_payload w5.lzdio
-
-#==============================================================================
-# ---- GPG/PGP/PGP5 signature macros.
-#	Macro(s) to hold the arguments passed to GPG/PGP for package
-#	signing and verification.
-#
-
-# We disable the gpg key automatic querying 
-%_hkp_keyserver_query   %nil
-
-
-#	Verify digest/signature flags for various rpm modes:
-#	0x30300 (_RPMVSF_NODIGESTS)    --nohdrchk      if set, don't check digest(s)
-#	0xc0c00 (_RPMVSF_NOSIGNATURES) --nosignature   if set, don't check signature(s)
-#	0xf0000 (_RPMVSF_NOPAYLOAD)    --nolegacy      if set, check header+payload (if possible)
-#	0x00f00 (_RPMVSF_NOHEADER)     --nohdrchk      if set, don't check rpmdb headers
-%_vsflags_query		0xc0c00
-
-
-#	Open all indices before doing chroot(2).
-#
-%_openall_before_chroot	1
-
-%_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)
-%_filetriggers_dir /var/lib/rpm/filetriggers

Copied: rpm/rpm-setup/tags/1.116/macros.in (from rev 422, rpm/rpm-setup/trunk/macros.in)
===================================================================
--- rpm/rpm-setup/tags/1.116/macros.in	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/macros.in	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,69 @@
+# @RPMVENDORDIR@/macros:
+# Main Mangeia rpm configuration
+# Only modified macros goes here
+#
+# $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
+# should be added to /etc/rpm/macros, while per-user configuration should
+# be added to ~/.rpmmacros.
+
+%_host_vendor @RPMCANONVENDOR@
+%_real_vendor @RPMCANONVENDOR@
+
+%_vendor @RPMVENDOR@
+
+%_gnu @CANONTARGETGNU@
+%_target_platform	%{_target_cpu}-%{_real_vendor}-%{_target_os}%{?_gnu}
+
+%_host %{_host_cpu}-%{_real_vendor}-%{_host_os}
+
+%_changelog_truncate	3 years ago
+
+# use LZMA to compress binary packages:
+%_binary_payload w5.lzdio
+
+#==============================================================================
+# ---- GPG/PGP/PGP5 signature macros.
+#	Macro(s) to hold the arguments passed to GPG/PGP for package
+#	signing and verification.
+#
+
+# We disable the gpg key automatic querying 
+%_hkp_keyserver_query   %nil
+
+
+#	Verify digest/signature flags for various rpm modes:
+#	0x30300 (_RPMVSF_NODIGESTS)    --nohdrchk      if set, don't check digest(s)
+#	0xc0c00 (_RPMVSF_NOSIGNATURES) --nosignature   if set, don't check signature(s)
+#	0xf0000 (_RPMVSF_NOPAYLOAD)    --nolegacy      if set, check header+payload (if possible)
+#	0x00f00 (_RPMVSF_NOHEADER)     --nohdrchk      if set, don't check rpmdb headers
+%_vsflags_query		0xc0c00
+
+
+#	Open all indices before doing chroot(2).
+#
+%_openall_before_chroot	1
+
+%_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)
+%_filetriggers_dir /var/lib/rpm/filetriggers
+
+# directories #######################################
+%_sysconfdir    /etc
+%_initrddir     %{_sysconfdir}/rc.d/init.d
+%_infodir       %_datadir/info
+%_mandir        %_datadir/man
+%_defaultdocdir %_datadir/doc
+
+%_localstatedir %{_var}
+%_logdir 	%{_var}/log
+%_libexecdir 	%_libdir
+
+%_docdir_fmt	%%{NAME}

Copied: rpm/rpm-setup/tags/1.116/rpmb_deprecated (from rev 426, rpm/rpm-setup/trunk/rpmb_deprecated)
===================================================================
--- rpm/rpm-setup/tags/1.116/rpmb_deprecated	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/rpmb_deprecated	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo '"rpm -b" is deprecated, use "rpmbuild -b"' 1>&2
+exec rpmbuild "$@"

Copied: rpm/rpm-setup/tags/1.116/rpmpopt (from rev 426, rpm/rpm-setup/trunk/rpmpopt)
===================================================================
--- rpm/rpm-setup/tags/1.116/rpmpopt	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/rpmpopt	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,24 @@
+# mageia rpmpopt
+# $Id: rpmpopt 167053 2008-02-13 15:29:05Z pixel $
+
+rpm	exec --bp		rpmb_deprecated -bp
+rpm	exec --bc		rpmb_deprecated -bc
+rpm	exec --bi		rpmb_deprecated -bi
+rpm	exec --bl		rpmb_deprecated -bl
+rpm	exec --ba		rpmb_deprecated -ba
+rpm	exec --bb		rpmb_deprecated -bb
+rpm	exec --bs		rpmb_deprecated -bs
+rpm	exec --tp		rpmb_deprecated -tp
+rpm	exec --tc		rpmb_deprecated -tc
+rpm	exec --ti		rpmb_deprecated -ti
+rpm	exec --tl		rpmb_deprecated -tl
+rpm	exec --ta		rpmb_deprecated -ta
+rpm	exec --tb		rpmb_deprecated -tb
+rpm	exec --ts		rpmb_deprecated -ts
+rpm	exec --rebuild		rpmb_deprecated --rebuild
+rpm	exec --recompile	rpmb_deprecated --recompile
+rpm	exec --clean		rpmb_deprecated --clean
+rpm	exec --rmsource		rpmb_deprecated --rmsource
+rpm	exec --rmspec		rpmb_deprecated --rmspec
+rpm	exec --target		rpmb_deprecated --target
+rpm	exec --short-circuit	rpmb_deprecated --short-circuit

Deleted: rpm/rpm-setup/tags/1.116/rpmrc.in
===================================================================
--- rpm/rpm-setup/trunk/rpmrc.in	2011-02-04 22:19:52 UTC (rev 420)
+++ rpm/rpm-setup/tags/1.116/rpmrc.in	2011-02-05 22:13:37 UTC (rev 430)
@@ -1,103 +0,0 @@
-# $Id: rpmrc.in 232782 2008-01-07 17:34:01Z pixel $
-#
-# @RPMVENDORDIR@/rpmrc
-
-#############################################################
-# Values for RPM_OPT_FLAGS for various platforms
-
-optflags: i386 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i386 -fasynchronous-unwind-tables
-optflags: i486 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i486 -fasynchronous-unwind-tables
-optflags: k6   %{__common_cflags_with_ssp} -fomit-frame-pointer -march=k6 -fasynchronous-unwind-tables
-optflags: i586 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i586 -mtune=generic -fasynchronous-unwind-tables
-optflags: i686 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i686 -fasynchronous-unwind-tables
-optflags: athlon %{__common_cflags_with_ssp} -fomit-frame-pointer -march=athlon -fasynchronous-unwind-tables
-optflags: pentium3 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=pentium3 -fasynchronous-unwind-tables
-optflags: pentium4 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=pentium4 -fasynchronous-unwind-tables
-
-optflags: x86_64 %{__common_cflags_with_ssp}
-optflags: amd64 %{__common_cflags_with_ssp}
-optflags: ia32e %{__common_cflags_with_ssp}
-
-optflags: ia64 %{__common_cflags}
-  
-  # XXX Please note that -mieee has been added in rpm-3.0.5.
-optflags: alpha %{__common_cflags} -mieee -mcpu=ev5
-optflags: alphaev5 %{__common_cflags} -mieee -mcpu=ev5
-optflags: alphaev56 %{__common_cflags} -mieee -mcpu=ev56
-optflags: alphapca56 %{__common_cflags} -mieee -mcpu=pca56
-optflags: alphaev6 %{__common_cflags} -mieee -mcpu=ev6
-optflags: alphaev67 %{__common_cflags} -mieee -mcpu=ev67
-
-optflags: sparc %{__common_cflags} -m32 -mtune=ultrasparc
-optflags: sparcv9 %{__common_cflags} -m32 -mcpu=ultrasparc
-optflags: sparc64 %{__common_cflags} -m64 -mcpu=ultrasparc
-
-optflags: m68k %{__common_cflags} -fomit-frame-pointer
-
-optflags: ppc %{__common_cflags_with_ssp} -fsigned-char -mcpu=750 -mtune=7450
-optflags: ppciseries %{__common_cflags_with_ssp} -fsigned-char
-optflags: ppcpseries %{__common_cflags_with_ssp} -fsigned-char
-optflags: ppc32 %{__common_cflags_with_ssp} -m32 -fsigned-char -mcpu=power4 -mtune=cell
-optflags: ppc64 %{__common_cflags_with_ssp} -m64 -fsigned-char -mcpu=power4 -mtune=cell
-
-optflags: parisc %{__common_cflags} -mpa-risc-1-0
-optflags: hppa1.0 %{__common_cflags} -mpa-risc-1-0
-optflags: hppa1.1 %{__common_cflags} -mpa-risc-1-0
-optflags: hppa1.2 %{__common_cflags} -mpa-risc-1-0
-optflags: hppa2.0 %{__common_cflags} -mpa-risc-1-0
-
-optflags: mips %{__common_cflags}
-optflags: mipsel %{__common_cflags}
-
-optflags: armv3l %{__common_cflags} -fsigned-char -fomit-frame-pointer -march=armv3
-optflags: armv4b %{__common_cflags} -fsigned-char -fomit-frame-pointer -march=armv4
-optflags: armv4l %{__common_cflags} -fsigned-char -fomit-frame-pointer -march=armv4
-
-optflags: atarist %{__common_cflags} -fomit-frame-pointer
-optflags: atariste %{__common_cflags} -fomit-frame-pointer
-optflags: ataritt %{__common_cflags} -fomit-frame-pointer
-optflags: falcon %{__common_cflags} -fomit-frame-pointer
-optflags: atariclone %{__common_cflags} -fomit-frame-pointer
-optflags: milan %{__common_cflags} -fomit-frame-pointer
-optflags: hades %{__common_cflags} -fomit-frame-pointer
-
-optflags: s390 %{__common_cflags_with_ssp}
-optflags: s390x %{__common_cflags_with_ssp}
-
-#############################################################
-# Canonical arch names and numbers
-
-arch_canon:	sparc64:sparc64 10
-arch_canon:	sun4u:	sparc64 10
-
-arch_canon:	x86_64:	x86_64	19
-
-#############################################################
-# Canonical OS names and numbers
-
-#############################################################
-# For a given uname().machine, the default build arch
-
-buildarchtranslate: athlon: i586
-buildarchtranslate: pentium4: i586
-buildarchtranslate: pentium3: i586
-buildarchtranslate: i686: i586
-buildarchtranslate: k6: i586
-buildarchtranslate: i586: i586
-buildarchtranslate: i486: i486
-buildarchtranslate: i386: i386
-buildarchtranslate: i386: i386
-
-#############################################################
-# Architecture compatibility
-
-arch_compat: k6: i586
-
-arch_compat: osfmach3_i686: i686 osfmach3_i586
-arch_compat: osfmach3_i586: i586 osfmach3_i486
-arch_compat: osfmach3_i486: i486 osfmach3_i386
-arch_compat: osfmach3_i386: i486
-
-buildarch_compat: k6: i486
-
-macrofiles: @RPMLIBDIR@/macros:@RPMLIBDIR@/%{_target}/macros:@RPMVENDORDIR@/macros:@RPMVENDORDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros:@RPMSYSCONFDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros.cdb:@RPMSYSCONFDIR@/macros.d/*.macros:~/.rpmmacros

Copied: rpm/rpm-setup/tags/1.116/rpmrc.in (from rev 421, rpm/rpm-setup/trunk/rpmrc.in)
===================================================================
--- rpm/rpm-setup/tags/1.116/rpmrc.in	                        (rev 0)
+++ rpm/rpm-setup/tags/1.116/rpmrc.in	2011-02-05 22:13:37 UTC (rev 430)
@@ -0,0 +1,119 @@
+# $Id: rpmrc.in 232782 2008-01-07 17:34:01Z pixel $
+#
+# @RPMVENDORDIR@/rpmrc
+
+#############################################################
+# Values for RPM_OPT_FLAGS for various platforms
+
+optflags: i386 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i386 -fasynchronous-unwind-tables
+optflags: i486 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i486 -fasynchronous-unwind-tables
+optflags: k6   %{__common_cflags_with_ssp} -fomit-frame-pointer -march=k6 -fasynchronous-unwind-tables
+optflags: i586 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i586 -mtune=generic -fasynchronous-unwind-tables
+optflags: i686 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=i686 -fasynchronous-unwind-tables
+optflags: athlon %{__common_cflags_with_ssp} -fomit-frame-pointer -march=athlon -fasynchronous-unwind-tables
+optflags: pentium3 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=pentium3 -fasynchronous-unwind-tables
+optflags: pentium4 %{__common_cflags_with_ssp} -fomit-frame-pointer -march=pentium4 -fasynchronous-unwind-tables
+
+optflags: x86_64 %{__common_cflags_with_ssp}
+optflags: amd64 %{__common_cflags_with_ssp}
+optflags: ia32e %{__common_cflags_with_ssp}
+
+optflags: ia64 %{__common_cflags}
+  
+  # XXX Please note that -mieee has been added in rpm-3.0.5.
+optflags: alpha %{__common_cflags} -mieee -mcpu=ev5
+optflags: alphaev5 %{__common_cflags} -mieee -mcpu=ev5
+optflags: alphaev56 %{__common_cflags} -mieee -mcpu=ev56
+optflags: alphapca56 %{__common_cflags} -mieee -mcpu=pca56
+optflags: alphaev6 %{__common_cflags} -mieee -mcpu=ev6
+optflags: alphaev67 %{__common_cflags} -mieee -mcpu=ev67
+
+optflags: sparc %{__common_cflags} -m32 -mtune=ultrasparc
+optflags: sparcv9 %{__common_cflags} -m32 -mcpu=ultrasparc
+optflags: sparc64 %{__common_cflags} -m64 -mcpu=ultrasparc
+
+optflags: m68k %{__common_cflags} -fomit-frame-pointer
+
+optflags: ppc %{__common_cflags_with_ssp} -fsigned-char -mcpu=750 -mtune=7450
+optflags: ppciseries %{__common_cflags_with_ssp} -fsigned-char
+optflags: ppcpseries %{__common_cflags_with_ssp} -fsigned-char
+optflags: ppc32 %{__common_cflags_with_ssp} -m32 -fsigned-char -mcpu=power4 -mtune=cell
+optflags: ppc64 %{__common_cflags_with_ssp} -m64 -fsigned-char -mcpu=power4 -mtune=cell
+
+optflags: parisc %{__common_cflags} -mpa-risc-1-0
+optflags: hppa1.0 %{__common_cflags} -mpa-risc-1-0
+optflags: hppa1.1 %{__common_cflags} -mpa-risc-1-0
+optflags: hppa1.2 %{__common_cflags} -mpa-risc-1-0
+optflags: hppa2.0 %{__common_cflags} -mpa-risc-1-0
+
+optflags: mips %{__common_cflags} -march=mips3
+optflags: mipsel %{__common_cflags} -march=mips3
+optflags: mips32el %{__common_cflags} -march=mips3 -mabi=n32
+optflags: mips64el %{__common_cflags} -march=mips3 -mabi=64
+
+optflags: armv3l %{__common_cflags} -fsigned-char -march=armv3
+optflags: armv4b %{__common_cflags} -fsigned-char -march=armv4
+optflags: armv4l %{__common_cflags} -fsigned-char -march=armv4
+optflags: armv4t %{__common_cflags} -fsigned-char -march=armv4t
+optflags: armv5t %{__common_cflags} -fsigned-char -march=armv5t
+# Cortex A8
+optflags: armv7 %{__common_cflags} -fsigned-char -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+
+optflags: armv4tl %{__common_cflags} -fsigned-char -march=armv4t
+optflags: armv5tl %{__common_cflags} -fsigned-char -march=armv5t
+# Cortex A8
+optflags: armv7l %{__common_cflags} -fsigned-char -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+
+optflags: atarist %{__common_cflags} -fomit-frame-pointer
+optflags: atariste %{__common_cflags} -fomit-frame-pointer
+optflags: ataritt %{__common_cflags} -fomit-frame-pointer
+optflags: falcon %{__common_cflags} -fomit-frame-pointer
+optflags: atariclone %{__common_cflags} -fomit-frame-pointer
+optflags: milan %{__common_cflags} -fomit-frame-pointer
+optflags: hades %{__common_cflags} -fomit-frame-pointer
+
+optflags: s390 %{__common_cflags_with_ssp}
+optflags: s390x %{__common_cflags_with_ssp}
+
+#############################################################
+# Canonical arch names and numbers
+
+arch_canon:	sparc64:sparc64 10
+arch_canon:	sun4u:	sparc64 10
+
+arch_canon:	x86_64:	x86_64	19
+
+#############################################################
+# Canonical OS names and numbers
+
+#############################################################
+# For a given uname().machine, the default build arch
+
+buildarchtranslate: athlon: i586
+buildarchtranslate: pentium4: i586
+buildarchtranslate: pentium3: i586
+buildarchtranslate: i686: i586
+buildarchtranslate: k6: i586
+buildarchtranslate: i586: i586
+buildarchtranslate: i486: i486
+buildarchtranslate: i386: i386
+buildarchtranslate: i386: i386
+
+buildarchtranslate: armv5tel armv5tl
+buildarchtranslate: armv7l armv5tl
+buildarchtranslate: armv5t armv5t
+buildarchtranslate: armv7 armv5t
+
+#############################################################
+# Architecture compatibility
+
+arch_compat: k6: i586
+
+arch_compat: osfmach3_i686: i686 osfmach3_i586
+arch_compat: osfmach3_i586: i586 osfmach3_i486
+arch_compat: osfmach3_i486: i486 osfmach3_i386
+arch_compat: osfmach3_i386: i486
+
+buildarch_compat: k6: i486
+
+macrofiles: @RPMLIBDIR@/macros:@RPMLIBDIR@/%{_target}/macros:@RPMVENDORDIR@/macros:@RPMVENDORDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros:@RPMSYSCONFDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros.cdb:@RPMSYSCONFDIR@/macros.d/*.macros:~/.rpmmacros
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110205/a9605c95/attachment-0001.html>


More information about the Mageia-sysadm mailing list