diff --git a/debian.changelog b/debian.changelog deleted file mode 100644 index 0756636..0000000 --- a/debian.changelog +++ /dev/null @@ -1,6 +0,0 @@ -gptfdisk (0.8.2-1) stable; urgency=low - - * Initial Release - - -- Rod Smith Sun, 22 Jan 2022 15:11:38 +0100 - diff --git a/debian.control b/debian.control deleted file mode 100644 index 2c204d5..0000000 --- a/debian.control +++ /dev/null @@ -1,16 +0,0 @@ -Source: gptfdisk -Section: Applications/System -Priority: extra -Maintainer: Roderick Smith -Build-Depends: debhelper (>= 4.1.16), build-essential, uuid-dev, libpopt-dev, libicu-dev - -Package: gptfdisk -Architecture: any -Depends: ${shlibs:Depends} -Description: GPT partitioning and MBR repair software - Partitioning software for GPT disks and to repair MBR - disks. The gdisk and sgdisk utilities (in the gdisk - package) are GPT-enabled partitioning tools; the - fixparts utility (in the fixparts package) fixes some - problems with MBR disks that can be created by buggy - partitioning software. diff --git a/debian.rules b/debian.rules deleted file mode 100644 index f37d8eb..0000000 --- a/debian.rules +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - -build: build-stamp -build-stamp: - dh_testdir - - # Add here commands to compile the package. - make - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - make clean || true - # --- end custom part for cleaning up - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package - # The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/ - install -Dp gdisk /usr/src/packages/BUILD/debian/gptfdisk/usr/sbin/gdisk - install -Dp cgdisk /usr/src/packages/BUILD/debian/gptfdisk/usr/sbin/cgdisk - install -Dp sgdisk /usr/src/packages/BUILD/debian/gptfdisk/usr/sbin/sgdisk - install -Dp fixparts /usr/src/packages/BUILD/debian/gptfdisk/usr/sbin/fixparts - install -Dp -m 0644 gdisk.8 /usr/src/packages/BUILD/debian/gptfdisk/usr/share/man/man8/gdisk.8 - install -Dp -m 0644 cgdisk.8 /usr/src/packages/BUILD/debian/gptfdisk/usr/share/man/man8/cgdisk.8 - install -Dp -m 0644 sgdisk.8 /usr/src/packages/BUILD/debian/gptfdisk/usr/share/man/man8/sgdisk.8 - install -Dp -m 0644 fixparts.8 /usr/src/packages/BUILD/debian/gptfdisk/usr/share/man/man8/fixparts.8 - install -Dp -m 0644 README /usr/src/packages/BUILD/debian/gptfdisk/usr/share/doc/gptfdisk/README - install -Dp -m 0644 NEWS /usr/src/packages/BUILD/debian/gptfdisk/usr/share/doc/gptfdisk/NEWS - install -Dp -m 0644 COPYING /usr/src/packages/BUILD/debian/gptfdisk/usr/share/doc/gptfdisk/COPYING - - # --- end custom part for installing - -# Build architecture-independent files here. -binary-indep: build install - # We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit - dh_installcron - dh_installman - dh_installinfo -# dh_undocumented - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/gptfdisk-0.8.5-fix-test-suite-short-opt-usage.patch b/gptfdisk-0.8.5-fix-test-suite-short-opt-usage.patch new file mode 100644 index 0000000..32ea409 --- /dev/null +++ b/gptfdisk-0.8.5-fix-test-suite-short-opt-usage.patch @@ -0,0 +1,70 @@ +From bc168eec1f61cbdb9191fd07da74ae9f5e83495e Mon Sep 17 00:00:00 2001 +From: Ruediger Meier +Date: Fri, 18 Jan 2013 18:37:32 +0100 +Subject: [PATCH] fix test suite, short opt usage + +Short options and their argument should not separated by "=" but by +space. While this seemed to work with popt 1.16 it does not with +1.13 (which is still used in most recent Fedora distros). + +see also popt(3): "A space separates a short option from its +arguments; either a space or an = separates a long option from an +argument." + +Signed-off-by: Ruediger Meier +--- + gdisk_test.sh | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/gdisk_test.sh b/gdisk_test.sh +index e567d4c..8c5d800 100755 +--- a/gdisk_test.sh ++++ b/gdisk_test.sh +@@ -147,7 +147,7 @@ EOF + ;; + + sgdisk) +- $SGDISK_BIN $TEMP_DISK -${OPT_NEW}=1 -${OPT_CHANGE_NAME}=1:"${TEST_PART_DEFAULT_NAME}" ++ $SGDISK_BIN $TEMP_DISK -${OPT_NEW} 1 -${OPT_CHANGE_NAME} 1:"${TEST_PART_DEFAULT_NAME}" + ;; + esac + +@@ -171,7 +171,7 @@ EOF + ;; + + sgdisk) +- $SGDISK_BIN $TEMP_DISK -${OPT_CHANGE_NAME}=1:${TEST_PART_NEWNAME} ++ $SGDISK_BIN $TEMP_DISK -${OPT_CHANGE_NAME} 1:${TEST_PART_NEWNAME} + ;; + esac + +@@ -195,7 +195,7 @@ EOF + ;; + + sgdisk) +- $SGDISK_BIN $TEMP_DISK -${OPT_CHANGE_TYPE}=1:${TEST_PART_NEWTYPE} ++ $SGDISK_BIN $TEMP_DISK -${OPT_CHANGE_TYPE} 1:${TEST_PART_NEWTYPE} + ;; + esac + +@@ -219,7 +219,7 @@ echo "" + ;; + + sgdisk) +- $SGDISK_BIN $TEMP_DISK -${OPT_BACKUP}=${GPT_BACKUP_FILENAME} ++ $SGDISK_BIN $TEMP_DISK -${OPT_BACKUP} ${GPT_BACKUP_FILENAME} + ;; + esac + +@@ -248,7 +248,7 @@ EOF + ;; + + sgdisk) +- $SGDISK_BIN $TEMP_DISK -${OPT_DELETE}=1 ++ $SGDISK_BIN $TEMP_DISK -${OPT_DELETE} 1 + ;; + esac + +-- +1.7.6.1 + diff --git a/gptfdisk-0.8.5.tar.xz b/gptfdisk-0.8.5.tar.xz deleted file mode 100644 index 2884f21..0000000 --- a/gptfdisk-0.8.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9620c0cb950bd83d4d19c528bf3ee2ee34fef8dc14da0d179cba85aa43a571c -size 120060 diff --git a/gptfdisk-0.8.6.tar.xz b/gptfdisk-0.8.6.tar.xz new file mode 100644 index 0000000..befbc9f --- /dev/null +++ b/gptfdisk-0.8.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eede26b515049eadafe0cdcd8d8c40967b57ffc7aab2e0e24570d4576886bb51 +size 120788 diff --git a/gptfdisk.changes b/gptfdisk.changes index c15bb6d..f9847b5 100644 --- a/gptfdisk.changes +++ b/gptfdisk.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Jan 18 19:58:32 UTC 2013 - sweet_f_a@gmx.de + +- Update to new upstream release 0.8.6 +* add type codes for a Sony System Partition and for VMWare ESX +* fix the hybrid MBR creation support that could cause it to omit + the 0xEE partition under some circumstances +* fix a bug that could cause a crash when passing a partition + number of 0 via the -t option. + +------------------------------------------------------------------- +Fri Jan 18 12:01:39 UTC 2013 - sweet_f_a@gmx.de + +- remove outdated (0.8.2) debian spec files from package sources +- fix build for old suse and other distros +- add gptfdisk-0.8.5-fix-test-suite-short-opt-usage.patch and + enable test suite +- change package group to System/Base (rpmlint fix) + ------------------------------------------------------------------- Fri Jun 22 21:29:05 UTC 2012 - jengelh@inai.de diff --git a/gptfdisk.dsc b/gptfdisk.dsc deleted file mode 100644 index 407427d..0000000 --- a/gptfdisk.dsc +++ /dev/null @@ -1,10 +0,0 @@ -Format: 1.0 -Source: gptfdisk -Version: 0.8.2-1 -Binary: packageName -Maintainer: Roderick Smith -Architecture: any -Build-Depends: debhelper (>= 4.1.16), libncurses5-dev, build-essential, uuid-dev, libpopt-dev, libicu-dev -Files: - d57283ebb8157ae919762c58419353c8 133282 gptfdisk-0.8.2.tar.gz - 2fecf324a32123b08cefc0f047bca5ee 63176 gptfdisk-0.8.2.diff.tar.gz diff --git a/gptfdisk.spec b/gptfdisk.spec index 2b216c3..a82491d 100644 --- a/gptfdisk.spec +++ b/gptfdisk.spec @@ -1,7 +1,7 @@ # # spec file for package gptfdisk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,30 @@ Name: gptfdisk -Version: 0.8.5 +Version: 0.8.6 Release: 0 Summary: GPT partitioning and MBR repair software License: GPL-2.0 -Group: Base/System +Group: System/Base Url: http://rodsbooks.com/gdisk -#DL-URL: http://downloads.sf.net/gptfdisk/gptfdisk-0.8.5.tar.gz +#DL-URL: http://downloads.sf.net/gptfdisk/gptfdisk-0.8.6.tar.gz Source: %name-%version.tar.xz - +Patch1: gptfdisk-0.8.5-fix-test-suite-short-opt-usage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: xz +%if 0%{?suse_version} > 1140 BuildRequires: pkgconfig(icu-io) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(popt) BuildRequires: pkgconfig(uuid) +%else +BuildRequires: libicu-devel +BuildRequires: libuuid-devel +BuildRequires: popt-devel +%endif Obsoletes: gdisk < %version-%release Provides: gdisk = %version-%release @@ -48,7 +54,7 @@ buggy partitioning software. %package fixparts Summary: A tool for repairing certain types of damage to MBR disks -Group: Applications/System +Group: System/Base %description fixparts A program that corrects errors that can creep into MBR-partitioned @@ -58,6 +64,7 @@ provides a few additional partition manipulation features. %prep %setup -q +%patch -P 1 -p1 %build CFLAGS="%optflags" CXXFLAGS="%optflags" make %{?_smp_mflags} @@ -68,6 +75,9 @@ mkdir -p "$b/%_sbindir" "$b/%_mandir/man8"; install -pm0755 fixparts {,c,s}gdisk "$b/%_sbindir/"; install -pm0644 *.8 "$b/%_mandir/man8/"; +%check +./gdisk_test.sh + %files %defattr(-,root,root) %doc NEWS COPYING README