Automatic import for version 5.3.12

rpm-5.4.4-enable-rpmgio-net-transport.patch

@@ -0,0 +1,12 @@
+--- rpm-5.4.4/macros/mandriva.in.net_transport~	2011-12-11 00:11:49.185221624 +0100
++++ rpm-5.4.4/macros/mandriva.in	2011-12-11 00:13:30.790281912 +0100
+@@ -28,6 +28,9 @@
+ 
+ %_changelog_truncate	3 years ago
+ 
++# mdvbz#64914
++%_rpmgio		.ufdio
++
+ # This will die as soon as remaining usage has been phased out...
+ %mkrel(c:)		%{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}
+ %manbo_mkrel()		%mkrel

rpm-5.4.4-fix-rpmconstant-to-always-use-LC_CTYPE-C-for-case-conversion.patch

@@ -0,0 +1,20 @@
+--- rpm-5.4.4/rpmconstant/rpmconstant.c.locale~	2008-08-18 12:57:58.000000000 +0200
++++ rpm-5.4.4/rpmconstant/rpmconstant.c	2011-12-16 16:41:27.721549143 +0100
+@@ -89,7 +89,7 @@ int rpmconstInitToContext(rpmconst c, co
+     int rc = 0;
+     if (!context) return 0; /* programmer error */
+     for (ptr = lccontext; *ptr != 0; ptr++)
+-        *ptr = (char)tolower(*ptr);
++        *ptr = (char)xtolower(*ptr);
+     rpmconstInitL(c);
+     while (rpmconstNextL(c)) {
+         if (!strcmp(lccontext, rpmconstContext(c))) {
+@@ -108,7 +108,7 @@ int rpmconstNameMatch(rpmconst c, const
+     char * ucname = strdup(name);
+     
+     for (uc = ucname; *uc != 0; uc++)
+-        *uc = (char)toupper(*uc);
++        *uc = (char)xtoupper(*uc);
+     
+     if (!prefixed) prefixed = ALLCASE_PREFIX;
+     if (prefixed & WITH_PREFIX)

rpm.spec

@@ -52,7 +52,7 @@
 Summary:	The RPM package management system
 Name:		rpm
 Version:	%{libver}.%{minorver}
-Release:	%{?prereldate:0.%{prereldate}.}2
+Release:	%{?prereldate:0.%{prereldate}.}2.2
 Epoch:		1
 Group:		System/Configuration/Packaging
 URL:		http://rpm5.org/
@@ -92,6 +92,10 @@ Patch19:	rpm-5.3.10-doxygen-1.7.4-bug.patch
 Patch20:	rpm-5.3.11-fix-syslog-b0rkage.patch
 Patch21:	rpm-5.3.12-change-dep-loop-errors-to-warnings.patch
 Patch22:	rpm-5.3.12-55810-rpmevrcmp-again-grf.patch
+# fixes #63860
+Patch23:       rpm-5.4.4-fix-rpmconstant-to-always-use-LC_CTYPE-C-for-case-conversion.patch
+# fixes #64914
+Patch24:       rpm-5.4.4-enable-rpmgio-net-transport.patch
 License:	LGPLv2.1+
 BuildRequires:	autoconf >= 2.57 bzip2-devel automake >= 1.8 elfutils-devel
 BuildRequires:	sed >= 4.0.3 beecrypt-devel ed gettext-devel byacc
@@ -275,6 +279,8 @@ This package contains the RPM API documentation generated in HTML format.
 %patch20 -p1 -b .syslog~
 %patch21 -p1 -b .loop_warnings~
 %patch22 -p1 -b .55810~
+%patch23 -p1 -b .locale~
+%patch24 -p1 -b .rpmgio~
 
 mkdir -p cpu-os-macros
 tar -zxf %{SOURCE3} -C cpu-os-macros
@@ -388,7 +394,7 @@ echo '#define PREMACROFILES "%{_sysconfdir}/rpm/premacros.d/*.macros"' >> config
 %endif
 
 %check
-make check
+#make check
 
 %install
 %makeinstall_std
@@ -701,25 +707,16 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
 
 
 %changelog
-* Mon Feb 20 2012 abf
+* Wed Jan 11 2012 Oden Eriksson <oeriksson@mandriva.com> 1:5.3.12-0.20110712.2.2
-- The release updated by ABF
+- built for updates
 
-* Tue Jul 12 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110712.2
+* Mon Dec 19 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110712.2.1
-+ Revision: 689772
++ Revision: 743837
-- revert a previous commit of mine which broke deps without distepoch (rushed)
+- rebase on rpm-5.3.12-0.20110712.2, the actual version shipped with 2011...
-
+- enable rpmgio net transport by default (P22, fixes mdv#64914)
-* Tue Jul 12 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110712.1
+- fix locale related character case conversion issue breaking ie. urpmi with
-+ Revision: 689687
+  Turkish locale (P21, fixes mdv#63860)
-- change errors on dependency loops to warnings
+- bring back patch fixing rpmbuild broken with gnome-terminal (#62262)
-- update to new cvs snapshot:
-  	o fixes issues with upgrading packages of same EVR, but different
-  	  distepoch
-  	o fix /usr/lib/rpm/bin/dbconvert segfaulting when no root is provided
-  	o automatically install gstreamer.sh dep genereator
-
-* Wed Jul 06 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110625.3
-+ Revision: 689009
-- install gstreamer.sh dependency generator
 
 * Mon Jul 04 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:5.3.12-0.20110625.2
 + Revision: 688659
@@ -962,7 +959,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
 - finally put copyright & serial tags to death for real
 - reapply fix for rmpvercmp with missing values & conflicts behaviour fix(#55810)
 - update to to more recent debugedit that handles '.debug_pubtypes' section
-- "New" release: 4.6.4 (while awaiting decission on where to go next...)
+- "New" release: 4.6.1 (while awaiting decission on where to go next...)
 - fix %%exclude's behaviour to *only* mean exclude from %%files, not from check
   of unpackaged files. This brings back the behaviour we had in the past with
   rpm 4.4.8, and will require files not to be packaged to be deleted in %%install,
@@ -1028,7 +1025,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
     - fix unowned directory, reported by bitshuffler on irc, causing problem
       when installing rpm and using the wrong umask
 
-* Fri Sep 25 2009 Olivier Blin <oblin@mandriva.com> 1:4.6.0-6mnb2
+* Fri Sep 25 2009 Olivier Blin <blino@mandriva.org> 1:4.6.0-6mnb2
 + Revision: 448653
 - remove n32 support for now (not actually used)
 - handle n32 ABI in find-requires and find-provides (from Arnaud Patard)
@@ -1446,7 +1443,7 @@ cp -r apidocs/html %{buildroot}%{_docdir}/rpm
     - I suck, don't move man pages around at all and stop messing:p
     - move man page for perl module to perl-RPM package
 
-  + Olivier Blin <oblin@mandriva.com>
+  + Olivier Blin <blino@mandriva.org>
     - do not expand _install_langs macro in default /etc/rpm/macros
     - fix typo in default /etc/rpm/macros
     - explicitely require neon-devel 0.26 (does not build with neon 0.27)