- up to 1.9.0

Changed files:
    parted-BIG_FAT_WARNING.patch -> 1.5
    parted-etherd.patch -> 1.6
    parted-inline.patch -> 1.2
    parted.spec -> 1.149

diff --git a/parted-BIG_FAT_WARNING.patch b/parted-BIG_FAT_WARNING.patch
index 2c224c67562f91bf77a53448111bad864b7bb8f4..4462460a900f3d586852308b08b7669da6753a53 100644 (file)
--- a/parted-BIG_FAT_WARNING.patch
+++ b/parted-BIG_FAT_WARNING.patch
@@ -1,7 +1,7 @@
 --- parted-1.8.6/parted/ui.c.orig      2007-04-04 10:38:45.596415889 +0200
 +++ parted-1.8.6/parted/ui.c   2007-04-04 10:39:49.904080574 +0200
-@@ -159,6 +159,11 @@
- static char* banner_msg = N_(
+@@ -160,6 +160,11 @@
+ static const char* banner_msg = N_(
  "Welcome to GNU Parted! Type 'help' to view a list of commands.\n");
  
 +static char* warning_msg = N_(
@@ -9,7 +9,7 @@
 +"exit to write changes to partition table, you're experimenting on your\n"
 +"disk's live body.\n");
 +
- static char* usage_msg = N_(
+ static const char* usage_msg = N_(
  "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n"
  "Apply COMMANDs with PARAMETERS to DEVICE.  If no COMMAND(s) are given, "
 @@ -1463,7 +1468,7 @@

diff --git a/parted-etherd.patch b/parted-etherd.patch
index b58eb7bb5a78c7b34a733e32c6e3502ce13dfb70..62adfccd2318d3ff4a46be6cae9a26bd40870341 100644 (file)
--- a/parted-etherd.patch
+++ b/parted-etherd.patch
@@ -1,12 +1,12 @@
 --- parted-1.8.8/include/parted/device.h.orig  2007-07-31 21:03:53.000000000 +0200
 +++ parted-1.8.8/include/parted/device.h       2007-08-22 22:20:18.024824864 +0200
-@@ -48,7 +48,8 @@
- #ifdef ENABLE_DEVICE_MAPPER
+@@ -46,7 +46,8 @@
          PED_DEVICE_DM           = 12,
- #endif
--        PED_DEVICE_XVD          = 13
-+        PED_DEVICE_XVD          = 13,
-+        PED_DEVICE_AOE          = 14
+         PED_DEVICE_XVD          = 13,
+         PED_DEVICE_SDMMC        = 14,
+-        PED_DEVICE_VIRTBLK      = 15
++        PED_DEVICE_VIRTBLK      = 15,
++        PED_DEVICE_AOE          = 16
  } PedDeviceType;
  
  typedef struct _PedDevice PedDevice;

diff --git a/parted-inline.patch b/parted-inline.patch
deleted file mode 100644 (file)
index 3511668..0000000
--- a/parted-inline.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- parted-1.8.7/include/parted/natmath.h.orig 2007-04-18 17:12:10.000000000 -0400
-+++ parted-1.8.7/include/parted/natmath.h      2007-06-04 10:03:37.374232283 -0400
-@@ -87,10 +87,10 @@
- extern const PedAlignment* ped_alignment_any;
- extern const PedAlignment* ped_alignment_none;
- 
--extern inline PedSector
-+extern PedSector
- ped_div_round_up (PedSector numerator, PedSector divisor);
- 
--extern inline PedSector
-+extern PedSector
- ped_div_round_to_nearest (PedSector numerator, PedSector divisor);
- 
- #endif /* PED_NATMATH_H_INCLUDED */
---- parted-1.8.7/libparted/cs/natmath.c.orig   2007-04-18 17:12:10.000000000 -0400
-+++ parted-1.8.7/libparted/cs/natmath.c        2007-06-04 10:06:39.470610953 -0400
-@@ -75,13 +75,13 @@
-       return sector - abs_mod (sector, grain_size);
- }
- 
--inline PedSector
-+PedSector
- ped_div_round_up (PedSector numerator, PedSector divisor)
- {
-                 return (numerator + divisor - 1) / divisor;
- }
- 
--inline PedSector
-+PedSector
- ped_div_round_to_nearest (PedSector numerator, PedSector divisor)
- {
-                 return (numerator + divisor/2) / divisor;

diff --git a/parted.spec b/parted.spec
index 926a1983e2427495b9299f5b1224517ca1360fe1..0258a9a7e95c79acb9c61e104443ae51fea9cf76 100644 (file)
--- a/parted.spec
+++ b/parted.spec
@@ -15,12 +15,12 @@ Summary(pt_BR.UTF-8):       Ferramenta flexível de particionamento
 Summary(ru.UTF-8):     Программа GNU манипуляции дисковыми разделами
 Summary(uk.UTF-8):     Програма GNU маніпуляції дисковими розділами
 Name:          parted
-Version:       1.8.8
-Release:       4
+Version:       1.9.0
+Release:       1
 License:       GPL v3+
 Group:         Applications/System
-Source0:       http://ftp.gnu.org/gnu/parted/%{name}-%{version}.tar.bz2
-# Source0-md5: 607ab4c3cfd8455af6588b97d99ad0ba
+Source0:       http://ftp.gnu.org/gnu/parted/%{name}-%{version}.tar.xz
+# Source0-md5: a9ffa9b69f0b6099b75c32a03bb12f7f
 # restored from git repository
 Source1:       %{name}.m4
 Patch0:                %{name}-pl.po-update.patch
@@ -31,7 +31,6 @@ Patch4:               %{name}-info.patch
 Patch5:                %{name}-etherd.patch
 Patch6:                %{name}-headers.patch
 Patch7:                %{name}-man-pt.patch
-Patch8:                %{name}-inline.patch
 URL:           http://www.gnu.org/software/parted/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10
@@ -126,7 +125,7 @@ Biblioteka statyczna libparted.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %{?with_uClibc:%patch3 -p1}
@@ -134,7 +133,6 @@ Biblioteka statyczna libparted.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 rm -f po/stamp-po
 
@@ -191,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/{API,FAT} AUTHORS BUGS ChangeLog NEWS README THANKS TODO
 %lang(ja) %doc doc/USER.jp
+%attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %{!?with_static:%attr(755,root,root) %{_libdir}/libparted-*.so.*.*}
 %{_mandir}/man8/*