Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6677 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 12 years ago
parent
commit
183218aa6d
1 changed files with 18 additions and 22 deletions
  1. 18 22
      t/testdisk/testdisk-vl.spec

+ 18 - 22
t/testdisk/testdisk-vl.spec

@@ -4,20 +4,16 @@
 Summary:	Tool to check and undelete partition and files
 Summary(ja):	パーティションおよびファイルのチェックと復活を行うツール
 Name:		testdisk
-Version:	6.11
-Release:	2%{?_dist_release}
-License:	GPL
+Version:	6.13
+Release:	1%{?_dist_release}
+License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
-Source1:	progsreiserfs-%ver_progsreiserfs.tar.gz
-Source10:	http://www.cgsecurity.org/%{name}-doc-%{version}.tar.bz2
-Patch0:		progsreiserfs-journal.patch
-Patch1:		http://www.cgsecurity.org/photorec_611_exif_bound_checking_v2.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	ntfsprogs-devel
+BuildRequires:	ntfs-3g-devel
 BuildRequires:  libewf-devel
 BuildRequires:	zlib-devel
 BuildRequires:	openssl-devel
@@ -30,17 +26,10 @@ NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
 %prep
-%setup -q -a 1 -a 10 -D
-%patch0
-%patch1 -p1 -b .photorec
+%setup -q
 
 %build
-pushd progsreiserfs-%ver_progsreiserfs
-%configure --disable-Werror
-%__make
-popd
-
-%configure --with-reiserfs-lib=${RPM_BUILD_DIR}/%{name}-%{version}/progsreiserfs-%ver_progsreiserfs/libreiserfs/.libs/ --with-reiserfs-includes=${RPM_BUILD_DIR}/%{name}-%{version}/progsreiserfs-%ver_progsreiserfs/include/ --with-dal-lib=${RPM_BUILD_DIR}/%{name}-%{version}/progsreiserfs-%ver_progsreiserfs/libdal/.libs/ 
+%configure
 %__make %{?_smp_mflags}
 
 %install
@@ -52,14 +41,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc
-%{_mandir}/man1/testdisk.1*
-%{_mandir}/man1/photorec.1*
-%attr(755,root,root) %{_sbindir}/testdisk
-%attr(755,root,root) %{_sbindir}/photorec
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
+%{_mandir}/man8/testdisk.8*
+%{_mandir}/man8/photorec.8*
+%{_mandir}/man8/fidentify.8*
+%attr(755,root,root) %{_bindir}/fidentify
+%attr(755,root,root) %{_bindir}/testdisk
+%attr(755,root,root) %{_bindir}/photorec
 
 
 %changelog
+* Thu Aug 02 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 6.13-1
+- new upstream release 
+- BR: ntfs-3g-devel instead of ntfsprogs
+- remove all patches
+
 * Sat Jan 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.11-2
 - rebuild with openssl-1.0.0c