[packages/parted] - updated to 3.5 - removed obsolete Switch-gpt-header-move-and-msdos-overlap-to-python3 patch

qboosh qboosh at pld-linux.org
Sun May 8 18:17:20 CEST 2022 

commit d07e31cd0459fbdc3d2446eab746fecae5c63096
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun May 8 18:17:53 2022 +0200

    - updated to 3.5
    - removed obsolete Switch-gpt-header-move-and-msdos-overlap-to-python3 patch

 ...-header-move-and-msdos-overlap-to-python3.patch | 33 ----------------------
 parted-BIG_FAT_WARNING.patch                       | 14 ++++-----
 parted-link.patch                                  | 12 ++++----
 parted-no_wrap.patch                               | 21 ++++++--------
 parted.spec                                        |  8 ++----
 5 files changed, 24 insertions(+), 64 deletions(-)
---
diff --git a/parted.spec b/parted.spec
index d51ce15..e491ead 100644
--- a/parted.spec
+++ b/parted.spec
@@ -15,15 +15,14 @@ Summary(pt_BR.UTF-8):	Ferramenta flexível de particionamento
 Summary(ru.UTF-8):	Программа GNU манипуляции дисковыми разделами
 Summary(uk.UTF-8):	Програма GNU маніпуляції дисковими розділами
 Name:		parted
-Version:	3.3
+Version:	3.5
 Release:	1
 License:	GPL v3+
 Group:		Applications/System
 Source0:	https://ftp.gnu.org/gnu/parted/%{name}-%{version}.tar.xz
-# Source0-md5:	090655d05f3c471aa8e15a27536889ec
+# Source0-md5:	336fde60786d5855b3876ee49ef1e6b2
 # restored from git repository
 Source1:	%{name}.m4
-Patch92:	0092-Switch-gpt-header-move-and-msdos-overlap-to-python3.patch
 Patch109:	0109-t6000-dm-Stop-using-private-lvm-root.patch
 
 Patch1001:	%{name}-no_wrap.patch
@@ -34,7 +33,7 @@ Patch1005:	%{name}-man-pt.patch
 Patch1006:	%{name}-link.patch
 Patch1007:	static.patch
 URL:		http://www.gnu.org/software/parted/
-BuildRequires:	autoconf >= 2.63
+BuildRequires:	autoconf >= 2.71
 BuildRequires:	automake >= 1:1.11.6
 BuildRequires:	check >= 0.9.3
 BuildRequires:	device-mapper-devel >= 1.02.02
@@ -155,7 +154,6 @@ Biblioteka statyczna libparted.
 
 %prep
 %setup -q
-%patch92 -p1
 %patch109 -p1
 
 %patch1001 -p1
diff --git a/0092-Switch-gpt-header-move-and-msdos-overlap-to-python3.patch b/0092-Switch-gpt-header-move-and-msdos-overlap-to-python3.patch
deleted file mode 100644
index 1c7dff3..0000000
--- a/0092-Switch-gpt-header-move-and-msdos-overlap-to-python3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 38badae4d6b858da713b383b9bc7bdad6294ca1b Mon Sep 17 00:00:00 2001
-From: "Brian C. Lane" <bcl at redhat.com>
-Date: Wed, 27 Jun 2018 13:47:33 -0700
-Subject: [PATCH 92/92] Switch gpt-header-move and msdos-overlap to python3
-
----
- tests/gpt-header-move | 2 +-
- tests/msdos-overlap   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/gpt-header-move b/tests/gpt-header-move
-index 3dda5cb..18f58d0 100755
---- a/tests/gpt-header-move
-+++ b/tests/gpt-header-move
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- 
- # open img file, subtract 33 from altlba address, and move the last 33 sectors
- # back by 33 sectors
-diff --git a/tests/msdos-overlap b/tests/msdos-overlap
-index d6ae8d6..b2b03e6 100755
---- a/tests/msdos-overlap
-+++ b/tests/msdos-overlap
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- """
-     Write an overlapping partition to a msdos disk
- 
--- 
-2.17.1
-
diff --git a/parted-BIG_FAT_WARNING.patch b/parted-BIG_FAT_WARNING.patch
index 93d8560..42e5eb8 100644
--- a/parted-BIG_FAT_WARNING.patch
+++ b/parted-BIG_FAT_WARNING.patch
@@ -21,11 +21,11 @@
          str_list_print_wrap (list, screen_width (), 0, 0, stdout);
          str_list_destroy (list);
  
---- parted-3.2/po/pl.po.orig	2006-05-27 21:38:39.582850750 +0200
-+++ parted-3.2/po/pl.po	2006-05-27 21:41:33.121696250 +0200
-@@ -1717,6 +1717,18 @@
+--- parted-3.5/po/pl.po.orig	2022-05-08 08:30:52.067865409 +0200
++++ parted-3.5/po/pl.po	2022-05-08 08:32:36.797298041 +0200
+@@ -2928,6 +2928,18 @@ msgstr ""
  
- #: parted/ui.c:71
+ #: parted/ui.c:167
  msgid ""
 +"\n"
 +"WARNING: unlike other partitioning software, Parted does *NOT* wait for\n"
@@ -37,8 +37,8 @@
 +"*NIE* nie czeka na wyjście z programu z zapisaniem zmian w tablicy partycji\n"
 +"- używając go eksperymentuje się na żywym organizmie dysku.\n"
 +
-+#: parted/ui.c:71
++#: parted/ui.c:167
 +msgid ""
  "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n"
- "Apply COMMANDs with PARAMETERS to DEVICE.  If no COMMAND(s) are given, run in\n"
- "interactive mode.\n"
+ "Apply COMMANDs with PARAMETERS to DEVICE.  If no COMMAND(s) are given, run "
+ "in\n"
diff --git a/parted-link.patch b/parted-link.patch
index 3beb552..adc902d 100644
--- a/parted-link.patch
+++ b/parted-link.patch
@@ -8,9 +8,9 @@
  libparted_fs_resize_la_LDFLAGS =		\
    -Wl,--version-script=$(sym_file)		\
    -version-info $(CURRENT):$(REVISION):$(AGE)
---- parted-3.1/libparted/Makefile.am.orig	2012-03-02 17:05:13.000000000 +0100
-+++ parted-3.1/libparted/Makefile.am	2012-03-06 19:00:48.832704671 +0100
-@@ -12,7 +12,7 @@
+--- parted-3.5/libparted/Makefile.am.orig	2022-04-18 20:38:45.000000000 +0200
++++ parted-3.5/libparted/Makefile.am	2022-05-08 08:36:04.349506967 +0200
+@@ -13,7 +13,7 @@ ARCH_SOURCE = arch/$(OS).c
  
  AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
  
@@ -19,8 +19,8 @@
  
  
  partedincludedir = \
-@@ -60,6 +60,9 @@
-   $(LIB_BLKID)		\
+@@ -60,6 +60,9 @@ libparted_la_LIBADD =	\
+   $(UUID_LIBS)		\
    $(INTLLIBS)
  
 +fs/libfs.la:
@@ -28,4 +28,4 @@
 +
  EXTRA_DIST	      = mbr.s
  
- INCLUDES = $(partedincludedir) $(INTLINCS)
+ AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)
diff --git a/parted-no_wrap.patch b/parted-no_wrap.patch
index 4f7f4ac..ceb5ccb 100644
--- a/parted-no_wrap.patch
+++ b/parted-no_wrap.patch
@@ -1,16 +1,11 @@
-Only in parted-1.4.19-/parted: tags
-diff -ur parted-1.4.19/parted/ui.c parted-1.4.19-/parted/ui.c
---- parted-1.4.19/parted/ui.c	Tue Sep 18 23:16:37 2001
-+++ parted-1.4.19-/parted/ui.c	Sun Oct 28 15:39:50 2001
-@@ -91,6 +91,11 @@
+--- parted-3.5/parted/ui.c.orig	2022-05-08 08:11:19.070886745 +0200
++++ parted-3.5/parted/ui.c	2022-05-08 08:17:50.045435321 +0200
+@@ -222,7 +222,7 @@ screen_width ()
  {
- 	int	width = 0;
+         int    width = 0;
+ 
+-        if (opt_script_mode || pretend_input_tty)
++        if (opt_script_mode || pretend_input_tty || !isatty (0))
+                 return 32768;    /* no wrapping ;) */
  
-+	/* don't wrap lines if we are not writing to terminal
-+	 * (crucial for scripting) */
-+	if (!isatty(fileno(stdout)))
-+		return 9999;
-+
  /* HACK: don't specify termcap separately - it'll annoy the users. */
- #ifdef HAVE_LIBREADLINE
- 	width = tgetnum ("co");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/parted.git/commitdiff/d07e31cd0459fbdc3d2446eab746fecae5c63096

More information about the pld-cvs-commit mailing list