From edfda21e4d6db39944f7e35a16d7f05e1911c8d63ad58f5cf7d83a6c8108604c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 13 Oct 2014 18:41:08 +0000 Subject: [PATCH] Roll back directcommit changes. Though I am a proponent of autotooling (not "autoconfiscation", this satirical naming sounds similar to the overuse of "Micro$oft"), the extra 71 lines of text maintenance do not buy much w.r.t. gptfdisk. OBS-URL: https://build.opensuse.org/package/show/filesystems/gptfdisk?expand=0&rev=7 --- gptfdisk-autoconfiscation.tar.xz | 3 --- gptfdisk.changes | 5 ----- gptfdisk.spec | 20 +++++++------------- 3 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 gptfdisk-autoconfiscation.tar.xz diff --git a/gptfdisk-autoconfiscation.tar.xz b/gptfdisk-autoconfiscation.tar.xz deleted file mode 100644 index 5bd66dc..0000000 --- a/gptfdisk-autoconfiscation.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:626010d2729e800c1e23c1c31251dfb663a69f3be25339e79253a795565a9679 -size 1180 diff --git a/gptfdisk.changes b/gptfdisk.changes index 1acb5c1..fd8cc59 100644 --- a/gptfdisk.changes +++ b/gptfdisk.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 13 14:34:34 UTC 2014 - pth@suse.com - -- Autoconfiscate the package thus easing build and installation. - ------------------------------------------------------------------- Tue Mar 4 10:19:25 UTC 2014 - sweet_f_a@gmx.de diff --git a/gptfdisk.spec b/gptfdisk.spec index ce93b94..381e10d 100644 --- a/gptfdisk.spec +++ b/gptfdisk.spec @@ -25,7 +25,6 @@ Group: System/Base Url: http://rodsbooks.com/gdisk Source: http://downloads.sf.net/%name/%name-%version.tar.gz -Source1: gptfdisk-autoconfiscation.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: ncurses-devel @@ -35,13 +34,8 @@ BuildRequires: pkgconfig(popt) BuildRequires: pkgconfig(uuid) %else BuildRequires: libuuid-devel -BuildRequires: pkgconfig BuildRequires: popt-devel %endif -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: pkgconfig Obsoletes: gdisk < %version-%release Provides: gdisk = %version-%release @@ -53,7 +47,7 @@ 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. -%package fixparts +%package fixparts Summary: A tool for repairing certain types of damage to MBR disks Group: System/Base @@ -64,16 +58,16 @@ and enables changing primary vs. logical partition status. Also provides a few additional partition manipulation features. %prep -%setup -q -a1 -rm -f Makefile +%setup -q %build -autoreconf -fi -%configure -make %{?_smp_mflags} +CFLAGS="%optflags" CXXFLAGS="%optflags" make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +b="%buildroot"; +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