commit 0b563a65d690f8fa8d92e0a50105d716b8443cd9
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Oct 10 11:21:35 2019 +0200
- up to 0.3 from github
gpart-Makefile.patch | 13 ----------
gpart-errno.patch | 23 -----------------
gpart-l64seek.patch | 71 ----------------------------------------------------
gpart-ntfs-ppc.patch | 21 ----------------
gpart-openmode.patch | 11 --------
gpart-x86_64.patch | 11 --------
gpart.spec | 44 +++++++++++++-------------------
7 files changed, 17 insertions(+), 177 deletions(-)
---
diff --git a/gpart.spec b/gpart.spec
index 485530a..a20d57c 100644
--- a/gpart.spec
+++ b/gpart.spec
@@ -2,22 +2,15 @@ Summary: Guesses and recovers damaged Master Boot Records
Summary(pl.UTF-8): Odgaduje zawartość i odzyskuje uszkodzony Master Boot
Record
Summary(pt.UTF-8): Adivinha e recupera um Master Boot Record danificado
Name: gpart
-Version: 0.1h
-Release: 4
+Version: 0.3
+Release: 1
License: GPL
Group: Applications/System
-Source0:
http://www.stud.uni-hannover.de/user/76201/gpart/%{name}-%{version}.tar.gz
-# Source0-md5: ee3a2d2dde70bcf404eb354b3d1ee6d4
-Patch0: %{name}-Makefile.patch
-Patch1: %{name}-ntfs-ppc.patch
-Patch2: %{name}-errno.patch
-# ftp://ftp.namesys.com/pub/misc-patches/
-Patch3: gpart-0.1h-reiserfs-3.6.patch.gz
-# Patch3-md5: ed479abcb1d7612669c4275a1c445085
-Patch4: %{name}-x86_64.patch
-Patch5: %{name}-l64seek.patch
-Patch6: %{name}-openmode.patch
-URL: http://www.stud.uni-hannover.de/user/76201/gpart/
+Source0: https://github.com/baruch/gpart/archive/%{version}.tar.gz
+# Source0-md5: 2d709068b5123198b3eb337f9d4686a8
+URL: https://github.com/baruch/gpart/
+BuildRequires: autoconf
+BuildRequires: automake
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
@@ -38,29 +31,26 @@ ela esteja danificada.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p2
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
-%{__make} OPT="%{rpmcflags}"
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+
+%configure
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_mandir}/man8,%{_sbindir}}
-install src/gpart $RPM_BUILD_ROOT%{_sbindir}/
-install man/gpart.8 $RPM_BUILD_ROOT%{_mandir}/man8
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc Changes README
+%doc Changes README.md
%attr(755,root,root) %{_sbindir}/gpart
-%{_mandir}/man8/*
+%{_mandir}/man8/gpart.8*
diff --git a/gpart-Makefile.patch b/gpart-Makefile.patch
deleted file mode 100644
index 18d6de2..0000000
--- a/gpart-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru gpart-0.1e/make.defs gpart-0.1e.new/make.defs
---- gpart-0.1e/make.defs Sun Aug 29 15:56:24 1999
-+++ gpart-0.1e.new/make.defs Mon Jun 19 12:02:21 2000
-@@ -2,7 +2,8 @@
- #
- #
- CC = gcc
--CFLAGS = -Wall -O2 -pedantic
-+OPT = -Wall -O2 -pedantic
-+CFLAGS = $(OPT)
- LDFLAGS =
- MAKEDEP = gcc -M
- INSTALL = install
diff --git a/gpart-errno.patch b/gpart-errno.patch
deleted file mode 100644
index 61f41df..0000000
--- a/gpart-errno.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur gpart-0.1h.org/src/disku.c gpart-0.1h/src/disku.c
---- gpart-0.1h.org/src/disku.c Wed Feb 7 19:04:07 2001
-+++ gpart-0.1h/src/disku.c Sun Mar 16 11:20:39 2003
-@@ -19,6 +19,8 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#include <errno.h>
-+
- #include "gpart.h"
-
- #if defined(__linux__)
-diff -Nur gpart-0.1h.org/src/l64seek.c gpart-0.1h/src/l64seek.c
---- gpart-0.1h.org/src/l64seek.c Wed Dec 13 22:54:11 2000
-+++ gpart-0.1h/src/l64seek.c Sun Mar 16 11:23:03 2003
-@@ -14,6 +14,7 @@
- *
- */
-
-+#include <errno.h>
- #include "l64seek.h"
-
-
diff --git a/gpart-l64seek.patch b/gpart-l64seek.patch
deleted file mode 100644
index 8a14411..0000000
--- a/gpart-l64seek.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- gpart-0.1h.orig/src/l64seek.c
-+++ gpart-0.1h/src/l64seek.c
-@@ -25,30 +25,11 @@
- } ostck[OSTACKLEN];
- static int osptr = -1;
-
--#if defined(__linux__) && defined(__i386__)
--_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh)
--#endif
--
--
--
- off64_t l64seek(int fd,off64_t offset,int whence)
- {
- off64_t ret = (off64_t)-1;
-
--#if defined(__linux__) && defined(__i386__)
-- int iret;
-- unsigned long ohi, olo;
--
-- ohi = (unsigned long)((offset >> 32) & 0xFFFFFFFF);
-- olo = (unsigned long)(offset & 0xFFFFFFFF);
-- iret = _llseek(fd,ohi,olo,&ret,whence);
-- if (iret == -1)
-- ret = (off64_t)-1;
--#endif
--
--#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__))
- ret = lseek(fd,offset,whence);
--#endif
-
- return (ret);
- }
---- gpart-0.1h.orig/src/l64seek.h
-+++ gpart-0.1h/src/l64seek.h
-@@ -17,6 +17,8 @@
- #ifndef _L64SEEK_H
- #define _L64SEEK_H
-
-+#include <sys/stat.h>
-+#include <sys/types.h>
- #include <unistd.h>
-
- /*
-@@ -25,19 +27,7 @@
- * offsets.
- */
-
--
--#if defined(__linux__)
--# include <linux/unistd.h>
--# include <sys/types.h>
-- typedef int64_t off64_t;
--#endif
--
--
--#if defined(__FreeBSD__)
-- typedef off_t off64_t;
--#endif
--
--
-+typedef loff_t off64_t;
- typedef off64_t s64_t;
-
- off64_t l64seek(int fd, off64_t offset, int whence);
-@@ -45,5 +35,4 @@
- int l64opush(int);
- s64_t l64opop(int);
-
--
- #endif
diff --git a/gpart-ntfs-ppc.patch b/gpart-ntfs-ppc.patch
deleted file mode 100644
index 00fb7bc..0000000
--- a/gpart-ntfs-ppc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr gpart-0.1h.old/src/gm_ntfs.h gpart-0.1h/src/gm_ntfs.h
---- gpart-0.1h.old/src/gm_ntfs.h Mon Jan 29 20:33:58 2001
-+++ gpart-0.1h/src/gm_ntfs.h Sat May 18 21:09:43 2002
-@@ -29,7 +29,7 @@
- /* 'NTFS' in little endian */
- #define NTFS_SUPER_MAGIC 0x5346544E
-
--#if defined(i386) || defined(__i386__) || defined(__alpha__)
-+#if defined(i386) || defined(__i386__) || defined(__alpha__) ||
defined(__powerpc__)
-
- /* unsigned integral types */
- #ifndef NTFS_INTEGRAL_TYPES
-@@ -39,7 +39,7 @@
- typedef unsigned int ntfs_u32;
- typedef s64_t ntfs_u64;
- #endif /* NTFS_INTEGRAL_TYPES */
--#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */
-+#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) ||
defined(__powerpc__)*/
-
-
- /* Macros reading unsigned integers from a byte pointer */
diff --git a/gpart-openmode.patch b/gpart-openmode.patch
deleted file mode 100644
index ca13cc9..0000000
--- a/gpart-openmode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpart.orig/src/gpart.c 2008-10-19 15:06:06.000000000 +0000
-+++ gpart/src/gpart.c 2008-11-25 07:34:47.000000000 +0000
-@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d,
- {
- int fd, ret = 0;
-
-- if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0)
-+ if ((fd = open(bfile,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP |
S_IROTH)) < 0)
- return (ret);
-
- if (write(fd,d->d_pt.t_boot,512) == 512)
diff --git a/gpart-x86_64.patch b/gpart-x86_64.patch
deleted file mode 100644
index bac907c..0000000
--- a/gpart-x86_64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpart-0.1h/src/gm_ntfs.h.org 2004-12-13 13:13:56.114967688 +0000
-+++ gpart-0.1h/src/gm_ntfs.h 2004-12-13 13:14:14.776130760 +0000
-@@ -29,7 +29,7 @@
- /* 'NTFS' in little endian */
- #define NTFS_SUPER_MAGIC 0x5346544E
-
--#if defined(i386) || defined(__i386__) || defined(__alpha__) ||
defined(__powerpc__)
-+#if defined(i386) || defined(__i386__) || defined(__alpha__) ||
defined(__powerpc__) || defined(__x86_64__)
-
- /* unsigned integral types */
- #ifndef NTFS_INTEGRAL_TYPES
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gpart.git/commitdiff/0b563a65d690f8fa8d92e0a50105d716b8443cd9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
