[parted] - Rebase on upstream stable release v3.2 - Drop upstream patches. - Patch t0251 to use en_US.UTF-8 i

Brian C. Lane bcl at fedoraproject.org
Wed Jul 30 21:20:05 UTC 2014


commit 06fca52438157e81e52173b1225a4f9689b2f3b2
Author: Brian C. Lane <bcl at redhat.com>
Date:   Tue Jul 29 12:07:49 2014 -0700

    - Rebase on upstream stable release v3.2
    - Drop upstream patches.
    - Patch t0251 to use en_US.UTF-8 if possible. Fedora doesn't have C.UTF-8

 .gitignore                                         |    2 +
 ...all-back-to-C.UTF-8-if-no-en_US-available.patch |   33 ++++++++++++++++++++
 0134-maint-correct-a-POT-file-updating-rule.patch  |   26 ---------------
 parted.spec                                        |   15 ++++++---
 sources                                            |    4 +-
 5 files changed, 47 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d287cc2..38e06af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ clog
 /parted-3.1.tar.xz.sig
 /parted-3.1.90.tar.xz
 /parted-3.1.90.tar.xz.sig
+/parted-3.2.tar.xz
+/parted-3.2.tar.xz.sig
diff --git a/0001-tests-Fall-back-to-C.UTF-8-if-no-en_US-available.patch b/0001-tests-Fall-back-to-C.UTF-8-if-no-en_US-available.patch
new file mode 100644
index 0000000..ef58b4e
--- /dev/null
+++ b/0001-tests-Fall-back-to-C.UTF-8-if-no-en_US-available.patch
@@ -0,0 +1,33 @@
+From 9489285380f256bb8072d5e24cecf906b80994b9 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <parted-owner at fedoraproject.org>
+Date: Wed, 30 Jul 2014 07:48:49 -0700
+Subject: [PATCH] tests: Fall back to C.UTF-8 if no en_US available
+
+Not all distributions (Fedora) have C.UTF-8 so first try en_US and fall
+back to it. This may still fail if neither exist.
+
+* tests/t0251-gpt-unicode.sh: Test for en_US and fall back to C.UTF-8
+---
+ tests/t0251-gpt-unicode.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/t0251-gpt-unicode.sh b/tests/t0251-gpt-unicode.sh
+index c845950..a51f541 100755
+--- a/tests/t0251-gpt-unicode.sh
++++ b/tests/t0251-gpt-unicode.sh
+@@ -22,7 +22,11 @@ dev=loop-file
+ # create zeroed device
+ truncate -s 10m $dev || fail=1
+ 
+-export LC_ALL=C.UTF-8
++if [ -e "/usr/share/locale/en_US/" ]; then
++    export LC_ALL=en_US.UTF-8
++else
++    export LC_ALL=C.UTF-8
++fi
+ # create gpt label with named partition
+ part_name=$(printf 'foo\341\264\244')
+ parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1
+-- 
+1.9.3
+
diff --git a/parted.spec b/parted.spec
index c0cf244..b9687f4 100644
--- a/parted.spec
+++ b/parted.spec
@@ -3,18 +3,18 @@
 
 Summary: The GNU disk partition manipulation program
 Name:    parted
-Version: 3.1.90
-Release: 2%{?dist}
+Version: 3.2
+Release: 1%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
 
-Source0: http://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
-Source1: http://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
+Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 Source2: pubkey.jim.meyering
 Source3: pubkey.phillip.susi
 
-Patch0134: 0134-maint-correct-a-POT-file-updating-rule.patch
+Patch0001: 0001-tests-Fall-back-to-C.UTF-8-if-no-en_US-available.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
@@ -156,6 +156,11 @@ fi
 
 
 %changelog
+* Wed Jul 30 2014 Brian C. Lane <bcl at redhat.com> 3.2-1
+- Rebase on upstream stable release v3.2
+- Drop upstream patches.
+- Patch t0251 to use en_US.UTF-8 if possible. Fedora doesn't have C.UTF-8
+
 * Wed Jul 30 2014 Tom Callaway <spot at fedoraproject.org> 3.1.90-2
 - fix license handling
 
diff --git a/sources b/sources
index eae9d52..fce77d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-48a72b4155ad0e8ff05f7bfdf78c3b79  parted-3.1.90.tar.xz
-2f1e2fd988963ad0a5c0361d88f5ef50  parted-3.1.90.tar.xz.sig
+0247b6a7b314f8edeb618159fa95f9cb  parted-3.2.tar.xz
+1b7304b51580d7121a890376ea7406d7  parted-3.2.tar.xz.sig


More information about the scm-commits mailing list