p7zip-15.14.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10120 ec354946-7b23-47d6-9f5a-488ba84defc7

p/p7zip/p7zip-vl.spec

@@ -1,22 +1,29 @@
 Summary:	A file archiver with very high compression ratio
 Summary(ja):	非常に圧縮率の高いファイルアーカイバ
 Name:		p7zip
-Version:	9.20.1
-Release:	2%{?_dist_release}
+Version:	15.14.1
+Release:	1%{?_dist_release}
 License:	LGPL
 Group:		Applications/Archiving
 URL:		http://p7zip.sourceforge.net/
 Source0		http://prdownloads.sourceforge.net/p7zip/p7zip_%{version}_src_all.tar.bz2
 
-Patch0: 01_makefile.patch
-Patch1: 02_man.patch
-Patch2: 04_no_strip_by_default.diff
+Patch0: p7zip_15.14-norar_cmake.patch
+# from Debain
+Patch5: 02_man.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	perl
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
+BuildRequires:	cmake
+%ifarch %{ix86}
+BuildRequires: nasm
+%endif
+%ifarch x86_64
+BuildRequires: yasm
+%endif
+
 %description
 p7zip is a port of 7-Zip for POSIX systems like Unix (Linux, Solaris,
 OpenBSD, FreeBSD, Cygwin, ...), MacOS X and BeOS.
@@ -49,23 +56,34 @@ This package contains also a virtual file system for Midnight Commander.
 
 %prep
 %setup -q -n %{name}_%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
-#%ifarch %{ix86} ppc alpha
-#%__cp -f makefile.linux_x86_ppc_alpha makefile.machine
-#%endif
+%patch0 -p1 -b .norar_cmake
+#Remove backups from DOC directory
+rm DOC/License.txt.*
+%patch5 -p1 -b .man
+# move license files
+mv DOC/License.txt DOC/copying.txt .
+
+%build
+pushd CPP/7zip/CMAKE/
+sh ./generate.sh
+popd
+%ifarch %{ix86}
+cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine
+%endif
 %ifarch x86_64
-%__cp -f makefile.linux_amd64 makefile.machine
+cp -f makefile.linux_amd64_asm makefile.machine
+%endif
+%ifarch ppc ppc64
+cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine
 %endif
 
-#%__perl -p -i -e 's/ -O2.*/ %{optflags} \\/' \
-%__perl -p -i -e 's/(OPTFLAGS=).*/\1%{optflags}/' \
-	makefile.machine
-
-%build
-%__make %{?_smp_mflags} all2
+make %{?_smp_mflags} all2 \
+    OPTFLAGS="%{optflags}" \
+    DEST_HOME=%{_prefix} \
+    DEST_BIN=%{_bindir} \
+    DEST_SHARE=%{_libdir}/p7zip \
+    DEST_MAN=%{_mandir}
 
 %check
 %__make test
@@ -73,54 +91,46 @@ This package contains also a virtual file system for Midnight Commander.
 %install
 %__rm -rf %{buildroot}
 
-# create directories
-%__mkdir_p %{buildroot}%{_bindir}
-%__mkdir_p %{buildroot}%{_libdir}/%{name}
-%__mkdir_p %{buildroot}%{_mandir}
-
-# install libraries
-%__tar cfC - bin . | %__tar xfC - %{buildroot}%{_libdir}/%{name}
+make install \
+    DEST_DIR=%{buildroot} \
+    DEST_HOME=%{_prefix} \
+    DEST_BIN=%{_bindir} \
+    DEST_SHARE=%{_libdir}/p7zip \
+    DEST_MAN=%{_mandir}
 
-# install man pages
-%__tar cf - man* | %__tar xfC - %{buildroot}%{_mandir}
-
-# install wrapper script for 7z
-%__cat << EOF > %{buildroot}%{_bindir}/7z
-#!/bin/sh
-exec %{_libdir}/%{name}/7z "\$@"
-EOF
-%__chmod 755 %{buildroot}%{_bindir}/7z
-
-# install wrapper script for 7za
-%__cat << EOF > %{buildroot}%{_bindir}/7za
-#!/bin/sh
-exec %{_libdir}/%{name}/7za "\$@"
-EOF
-%__chmod 755 %{buildroot}%{_bindir}/7za
+# remove redundant DOC dir
+mv %{buildroot}%{_docdir}/p7zip/DOC/* %{buildroot}%{_docdir}/p7zip
+rmdir %{buildroot}%{_docdir}/p7zip/DOC/
 
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog README TODO DOCS
+%{_docdir}/p7zip
+%license copying.txt License.txt
 %{_bindir}/7za
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/7za
-%{_libdir}/%{name}/7zCon.sfx
-%{_mandir}/man*/7za.*
+%dir %{_libdir}/p7zip/
+%{_libdir}/p7zip/7za
+%{_libdir}/p7zip/7zCon.sfx
+%{_mandir}/man1/7za.1*
+%exclude %{_mandir}/man1/7zr.1*
 
 %files plugins
 %defattr(-,root,root)
-%doc contrib
+%doc contrib/
 %{_bindir}/7z
-%{_libdir}/%{name}/7z
-%{_libdir}/%{name}/7z.so
-#%{_libdir}/%{name}/Codecs
-#{_libdir}/%{name}/Formats
-%{_mandir}/man*/*
+%dir %{_libdir}/p7zip/
+%{_libdir}/p7zip/7z
+%{_libdir}/p7zip/7z.so
+#{_libdir}/p7zip/Codecs/
+#{_libdir}/p7zip/Formats/
+%{_mandir}/man1/7z.1*
 
 %changelog
+* Wed Apr  6 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 15.14.1
+- new upstream release.
+
 * Sat May 24 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 9.20.1-2
 - rebuilt with new toolchain