- updated to 16.02

[packages/p7zip.git] / p7zip.spec

diff --git a/p7zip.spec b/p7zip.spec
index 217e740b3a1fb123845468713d236193d290530f..35e92e2a55e6ce015830908113c9f117ee91cb13 100644 (file)
--- a/p7zip.spec
+++ b/p7zip.spec
@@ -1,13 +1,14 @@
 Summary:       File archiver with highest compression ratio
 Summary(pl.UTF-8):     Paker plików z najwyższym stopniem kompresji
 Name:          p7zip
-Version:       4.51
+Version:       16.02
 Release:       1
 License:       LGPL v2.1+
 Group:         Applications/Archiving
-Source0:       http://dl.sourceforge.net/p7zip/%{name}_%{version}_src_all.tar.bz2
-# Source0-md5: d7f310fdb530cc1259d7b7ca28162747
+Source0:       http://downloads.sourceforge.net/p7zip/%{name}_%{version}_src_all.tar.bz2
+# Source0-md5: a0128d661cfe7cc8c121e73519c54fbf
 URL:           http://p7zip.sourceforge.net/
+BuildRequires: libstdc++-devel
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -54,37 +55,41 @@ wersja obsługująca wtyczki.
 %prep
 %setup -q -n %{name}_%{version}
 
-cp -f makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine
 %{__sed} -i -e 's/ -s / /' makefile.machine
 
-find . -name '*.cpp' -exec sed -i -e 's@getenv("P7ZIP_HOME_DIR")@"%{_libdir}/%{name}/"@g' {} \;
+find . -name '*.cpp' -exec %{__sed} -i -e 's@getenv("P7ZIP_HOME_DIR")@"%{_libdir}/%{name}/"@g' {} \;
 
 %build
-%{__make} all2 test \
+#%%{__make} all2 test \
+%{__make} all2 \
        CC="%{__cc} \$(ALLFLAGS)" \
        CXX="%{__cxx} \$(ALLFLAGS)" \
        LDFLAGS="%{rpmldflags}" \
-       OPTFLAGS="%{rpmcflags}"
+       OPTFLAGS="%{rpmcxxflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/{Codecs,Formats},%{_mandir}/man1}
 
-install bin/{7z,7zCon.sfx,7za} $RPM_BUILD_ROOT%{_bindir}
+install bin/{7z,7za} $RPM_BUILD_ROOT%{_bindir}
 install bin/7z.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 install bin/Codecs/* $RPM_BUILD_ROOT%{_libdir}/%{name}/Codecs
+install bin/7zCon.sfx $RPM_BUILD_ROOT%{_libdir}/%{name}
 
-install man1/7z* $RPM_BUILD_ROOT%{_mandir}/man1
+install man1/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+# 7zr is not packaged (subset of 7za functionality)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/7zr.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc DOCS/{MANUAL,{7zFormat,License,Methods,history,lzma,readme}.txt} ChangeLog README TODO
+%doc DOC/{MANUAL,{7zFormat,License,Methods,lzma,readme,src-history}.txt} ChangeLog README TODO
+# devel: %doc DOC/7zC.txt
 %attr(755,root,root) %{_bindir}/7z
-%attr(755,root,root) %{_bindir}/7zCon.sfx
 %dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/7zCon.sfx
 %attr(755,root,root) %{_libdir}/%{name}/7z.so
 %dir %{_libdir}/%{name}/Codecs
 %attr(755,root,root) %{_libdir}/%{name}/Codecs/*