packages (rpm-4_5): rpm/rpm-libmagic-locale.patch, rpm/rpm.spec - rel 64; o...

[arekm]

Author: arekm                        Date: Wed Feb 29 18:46:50 2012 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- rel 64; ouh, strdup correct thing

---- Files affected:
packages/rpm:
   rpm-libmagic-locale.patch (1.1.2.2 -> 1.1.2.3) , rpm.spec (1.837.2.42.2.49.2.119 -> 1.837.2.42.2.49.2.120) 

---- Diffs:

================================================================
Index: packages/rpm/rpm-libmagic-locale.patch
diff -u packages/rpm/rpm-libmagic-locale.patch:1.1.2.2 packages/rpm/rpm-libmagic-locale.patch:1.1.2.3
--- packages/rpm/rpm-libmagic-locale.patch:1.1.2.2	Wed Feb 29 16:39:42 2012
+++ packages/rpm/rpm-libmagic-locale.patch	Wed Feb 29 19:46:44 2012
@@ -14,7 +14,7 @@
 +			setlocale(LC_CTYPE, "C");
 +		}
 +		if (old_collate) {
-+			old_ctype = xstrdup(old_collate);
++			old_collate = xstrdup(old_collate);
 +			setlocale(LC_COLLATE, "C");
 +		}
 +

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.119 packages/rpm/rpm.spec:1.837.2.42.2.49.2.120
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.119	Wed Feb 29 16:39:42 2012
+++ packages/rpm/rpm.spec	Wed Feb 29 19:46:44 2012
@@ -58,7 +58,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	63
+Release:	64
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -1495,6 +1495,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.120  2012/02/29 18:46:44  arekm
+- rel 64; ouh, strdup correct thing
+
 Revision 1.837.2.42.2.49.2.119  2012/02/29 15:39:42  arekm
 - rel 63; set also LC_COLLATE=C before doing magic_file() check; fixes problem with libreoffice building
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-libmagic-locale.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.119&r2=1.837.2.42.2.49.2.120&f=u