mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-23 18:33:04 +00:00
Fix bugs with Turkish locales and URL handling
This commit is contained in:
parent
7f02ef849c
commit
a0c1cbcaff
3 changed files with 39 additions and 1 deletions
12
rpm-5.4.4-enable-rpmgio-net-transport.patch
Normal file
12
rpm-5.4.4-enable-rpmgio-net-transport.patch
Normal file
|
@ -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
|
|
@ -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)
|
8
rpm.spec
8
rpm.spec
|
@ -52,7 +52,7 @@
|
|||
Summary: The RPM package management system
|
||||
Name: rpm
|
||||
Version: %{libver}.%{minorver}
|
||||
Release: %{?prereldate:0.%{prereldate}.}7
|
||||
Release: %{?prereldate:0.%{prereldate}.}8
|
||||
Epoch: 1
|
||||
Group: System/Configuration/Packaging
|
||||
URL: http://rpm5.org/
|
||||
|
@ -98,6 +98,10 @@ Patch25: rpm-5.3.12.vendor.ROSA.patch
|
|||
|
||||
#Fix error in rpmbuild in GTK2-based terminals
|
||||
Patch26: rpm-5.3.8-rpmsq-ignored-signal-return-value.patch
|
||||
# fixes Turkey locale
|
||||
Patch27: rpm-5.4.4-fix-rpmconstant-to-always-use-LC_CTYPE-C-for-case-conversion.patch
|
||||
# fixes work with URLs
|
||||
Patch28: rpm-5.4.4-enable-rpmgio-net-transport.patch
|
||||
|
||||
License: LGPLv2.1+
|
||||
BuildRequires: autoconf >= 2.57 bzip2-devel automake >= 1.8 elfutils-devel
|
||||
|
@ -285,6 +289,8 @@ This package contains the RPM API documentation generated in HTML format.
|
|||
%patch23 -p1 -b .verify-segfault~
|
||||
%patch24 -p1 -b .cve-2012~
|
||||
%patch25 -p1
|
||||
%patch27 -p1 -b .locale~
|
||||
%patch28 -p1 -b .rpmgio~
|
||||
|
||||
mkdir -p cpu-os-macros
|
||||
tar -zxf %{SOURCE3} -C cpu-os-macros
|
||||
|
|
Loading…
Add table
Reference in a new issue