Update spec file to be a closer match to fedora 14 package

linux/testdisk.spec.in

@@ -1,58 +1,108 @@
 %define ver_progsreiserfs 0.3.1-rc8
-%define ver_libewf 20080501
+%define is_wip 1
+%{?is_wip:%define ver_wip -WIP}
 
 Summary:	TestDisk checks and undeletes partitions, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narzędzie sprawdzające i odzyskujące partycje
-Summary(fr.UTF8):	Outil pour vérifier et restorer des partitions
+Summary(fr.UTF8):	Outil pour vérifier et restaurer des partitions
 Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска
 Name:		@PACKAGE@
 Version:	@VERSION@
-Release:	1
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-Source0:	http://www.cgsecurity.org/%{name}-%{version}.tar.bz2
+Source0:	http://www.cgsecurity.org/testdisk-%{version}%{?ver_wip}.tar.bz2
-Source1:	progsreiserfs-%ver_progsreiserfs.tar.gz
+Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}%{?ver_wip}.tar.bz2
-Source3:	libewf-%ver_libewf.tar.gz
+Source2:	progsreiserfs-%ver_progsreiserfs.tar.gz
 Patch0:		progsreiserfs-journal.patch
 URL:		http://www.cgsecurity.org/wiki/TestDisk
-BuildRequires:	ncurses-devel >= 5.2
+BuildRequires:	e2fsprogs-devel
-BuildRequires:  e2fsprogs-devel
+BuildRequires:	libewf-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	zlib-devel
+BuildRequires:	libuuid-devel
-BuildRequires:	openssl-devel
+BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	ntfsprogs-devel
+BuildRequires:	openssl-devel
+BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
-NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
+NTFS, ext2, ext3, ext4, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
 LVM, LVM2, NSS, ReiserFS, UFS, XFS
 PhotoRec is a signature based file recovery utility. It handles more than
-100 file formats including jpg, MSOffice, OpenOffice documents.
+200 file formats including JPG, MSOffice, OpenOffice documents.
 
 %description -l pl.UTF8
 Narzędzie sprawdzające i odzyskujące partycje. Pracuje z partycjami:
-FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, BeFS, CramFS, HFS, JFS,
-Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+200 file formats including JPG, MSOffice, OpenOffice documents.
 
 %description -l fr.UTF8
-TestDisk vérifie et récupère les partitions effacées. Fonctionne avec
+TestDisk vérifie et récupère les partitions. Fonctionne avec
-FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, BeFS, CramFS, HFS, JFS,
-Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 PhotoRec utilise un mécanisme de signature pour récupérer des fichiers perdus.
-Il gère plus d'une centaine de formats de fichiers dont les jpeg, les documents
+Il gère plus d'une centaine de formats de fichiers dont les JPEG,
-MSOffice ou OpenOffice.
+les documents MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
 Программа для проверки и восстановления разделов диска.
 Поддерживает следующие типы разделов:
-FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, BeFS, CramFS, HFS, JFS,
-Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+200 file formats including JPG, MSOffice, OpenOffice documents.
+
+%package doc
+Summary:	TestDisk & PhotoRec documentation
+Group:		Documentation
+Requires:	testdisk = %{version}-%{release}
+
+%description doc
+Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
+NTFS, ext2, ext3, ext4, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
+LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+200 file formats including JPG, MSOffice, OpenOffice documents.
+
+This package contains TestDisk & PhotoRec documentation.
+
+%description doc -l pl.UTF8
+Narzędzie sprawdzające i odzyskujące partycje. Pracuje z partycjami:
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, BeFS, CramFS, HFS, JFS,
+Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+200 file formats including JPG, MSOffice, OpenOffice documents.
+
+This package contains TestDisk & PhotoRec documentation.
+
+%description doc -l fr.UTF8
+Outil pour vérifier et restaurer des partitions. Fonctionne avec
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, BeFS, CramFS, HFS, JFS,
+Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec utilise un mécanisme de signature pour récupérer des fichiers perdus.
+Il gère plus d'une centaine de formats de fichiers dont les JPEG,
+les documents MSOffice ou OpenOffice.
+
+Ce paquet contient la documentation de TestDisk & PhotoRec.
+
+%description doc -l ru_RU.UTF8
+Программа для проверки и восстановления разделов диска.
+Поддерживает следующие типы разделов:
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, BeFS, CramFS, HFS, JFS,
+Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec is a signature based file recovery utility. It handles more than
+200 file formats including JPG, MSOffice, OpenOffice documents.
+
+This package contains TestDisk & PhotoRec documentation.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?ver_wip}
-%setup -q -a 1 -D
+%setup -q -b 1 -D -n %{name}-%{version}%{?ver_wip}
-%setup -q -a 3 -D
+%setup -q -a 2 -D -n %{name}-%{version}%{?ver_wip}
 %patch0
 
 %build
@@ -61,32 +111,35 @@ cd progsreiserfs-%ver_progsreiserfs
 %configure --disable-Werror
 make
 )
-(
-cd libewf-%ver_libewf
-%configure
-make lib
-)
 %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/ 		\
+ --with-dal-lib=${RPM_BUILD_DIR}/%{name}-%{version}/progsreiserfs-%ver_progsreiserfs/libdal/.libs/
- --with-ewf-lib=${RPM_BUILD_DIR}/%{name}-%{version}/libewf-%{ver_libewf}/libewf/.libs/				\
+make %{?_smp_mflags}
- --with-ewf-includes=${RPM_BUILD_DIR}/%{name}-%{version}/libewf-%{ver_libewf}/include/
-make
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR="$RPM_BUILD_ROOT" install
+%if 0%{?is_wip}
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}-WIP $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%{_mandir}/man8/testdisk.8*
+%{_mandir}/man8/fidentify.8*
 %{_mandir}/man8/photorec.8*
-%attr(755,root,root) %{_sbindir}/testdisk
+%{_mandir}/man8/testdisk.8*
-%attr(755,root,root) %{_sbindir}/photorec
+%attr(755,root,root) %{_bindir}/fidentify
+%attr(755,root,root) %{_bindir}/photorec
+%attr(755,root,root) %{_bindir}/testdisk
+
+%files doc
+%defattr(644,root,root,755)
+%doc doc
+
 %changelog
 * Thu Jul 17 2008 Christophe Grenier <grenier@cgsecurity.org> 6.10-1
 - 6.10