commit 8c3bb23fd43398d6ec7038768d3ab017913ce4a3
Author: Jakub Bogusz <[email protected]>
Date: Sun Jul 21 09:56:57 2019 +0200
- updated to 7.1
- removed obsolete ac patch
testdisk-ac.patch | 11 -----------
testdisk.spec | 25 +++++++++++++------------
2 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/testdisk.spec b/testdisk.spec
index bce4c0d..8dd52da 100644
--- a/testdisk.spec
+++ b/testdisk.spec
@@ -7,19 +7,21 @@ Summary(fr.UTF-8): Outil pour vérifier et restorer des
partitions
Summary(pl.UTF-8): Narzędzie sprawdzające i odzyskujące partycje
Summary(ru.UTF-8): Программа для проверки и восстановления разделов диска
Name: testdisk
-Version: 7.0
-Release: 3
+Version: 7.1
+Release: 1
License: GPL v2+
Group: Applications/System
-Source0: http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
-# Source0-md5: f0cfe4ca9dd35f2878b2704251665e9f
-Patch0: %{name}-ac.patch
-URL: http://www.cgsecurity.org/wiki/TestDisk
-%{?with_qt:BuildRequires: QtGui-devel >= 4.0.1}
+#Source0Download: https://www.cgsecurity.org/wiki/TestDisk_Download
+Source0: https://www.cgsecurity.org/%{name}-%{version}.tar.bz2
+# Source0-md5: 57d78ffee1c076ef4cf541a74f8d52d4
+URL: https://www.cgsecurity.org/wiki/TestDisk
+%if %{with qt}
+BuildRequires: Qt5Gui-devel >= 5.0.0
+BuildRequires: Qt5Widgets-devel >= 5.0.0
+%endif
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: e2fsprogs-devel
-#BuildRequires: libcarvpath-devel
BuildRequires: libcom_err-devel
BuildRequires: libewf-devel
BuildRequires: libjpeg-devel
@@ -30,7 +32,7 @@ BuildRequires: ntfs-3g-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: progsreiserfs-devel >= 0.3.1-1.rc8.1
-%{?with_qt:BuildRequires: qt4-build >= 4}
+%{?with_qt:BuildRequires: qt5-build >= 5.0.0}
BuildRequires: zlib-devel
Requires: uname(release) >= 2.6.18
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -153,7 +155,6 @@ Graficzny interfejs użytkownika QPhotoRec.
%prep
%setup -q
-%patch0 -p1
%build
%{__aclocal}
@@ -162,7 +163,7 @@ Graficzny interfejs użytkownika QPhotoRec.
%{__automake}
%configure \
--bindir=%{_sbindir} \
- %{?__enable_disable qt qt} \
+ %{?__enable_disable qt} \
--disable-silent-rules
%{__make}
@@ -180,7 +181,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog INFO NEWS README THANKS *.html
+%doc AUTHORS ChangeLog INFO NEWS README.md THANKS *.html
%attr(755,root,root) %{_sbindir}/fidentify
%attr(755,root,root) %{_sbindir}/photorec
%attr(755,root,root) %{_sbindir}/testdisk
diff --git a/testdisk-ac.patch b/testdisk-ac.patch
deleted file mode 100644
index 9b4c4e2..0000000
--- a/testdisk-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- testdisk-6.10/configure.ac.orig 2008-07-17 13:13:38.000000000 +0200
-+++ testdisk-6.10/configure.ac 2008-07-17 23:14:59.366034707 +0200
-@@ -176,7 +176,7 @@
- [SUDO_BIN="${withval}"])
-
- AC_ARG_ENABLE([missing-uuid-ok],
-- AS_HELP_STRING(--enable-missing-uuid-ok, [force compilation even if both
uuidgen and uuid_generate are missing, for developpement only (default is NO)]),
-+ AS_HELP_STRING([--enable-missing-uuid-ok], [force compilation even if
both uuidgen and uuid_generate are missing, for developpement only (default is
NO)]),
- [case "${enableval}" in
- yes) missing_uuid_ok=true ;;
- no) missing_uuid_ok=false ;;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/testdisk.git/commitdiff/8c3bb23fd43398d6ec7038768d3ab017913ce4a3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
