- merge -libs and -static packages from AC-branch

Changed files:
    xz.spec -> 1.19

diff --git a/xz.spec b/xz.spec
index 18a8f8c84b0d252b6f7c312f0e20a2ee0c7da684..7f08ec3052b8e4802676c1a1f034e3cf854e1f30 100644 (file)
--- a/xz.spec
+++ b/xz.spec
@@ -1,19 +1,19 @@
-# TODO
-# - devel contains shared library. move to -static.
 Summary:       LZMA Encoder/Decoder
 Summary(pl):   Koder/Dekoder LZMA
 Name:          lzma
 Version:       4.43
-Release:       1
+Release:       2
 License:       CPL/LGPL
 Group:         Applications/Archiving
 Source0:       http://dl.sourceforge.net/sevenzip/%{name}443.tar.bz2
 # Source0-md5: c4e1b467184c7cffd4371c74df2baf0f
 Patch0:                %{name}-quiet.patch
 Patch1:                %{name}427_zlib.patch
+Patch2:                %{name}-shared.patch
 URL:           http://www.7-zip.org/sdk.html
 BuildRequires: gcc >= 5:3.4.0
 BuildRequires: libstdc++-devel
+# does not need -libs, due apps being not linked with shared lib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,10 +52,19 @@ Cechy LZMA:
 - Ma³y rozmiar kodu dekompresuj±cego: 2-8 KB (w zale¿no¶ci od opcji
   optymalizacji).
 
+%package libs
+Summary:       LZMA shared library
+Summary(pl):   Biblioteka LZMA
+Group:         Libraries
+
+%description libs
+LZMA shared library
+
 %package devel
 Summary:       LZMA library
 Summary(pl):   Biblioteka LZMA
 Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
 LZMA Library.
@@ -63,10 +72,20 @@ LZMA Library.
 %description devel -l pl
 Biblioteka LZMA.
 
+%package static
+Summary:       LZMA static library
+Summary(pl):   Biblioteka LZMA
+Group:         Development/Libraries
+# does not need -devel due it containing only library.
+
+%description static
+Static LZMA Library.
+
 %prep
 %setup -q -c
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cd C/7zip/Compress/LZMA_Alone
@@ -109,15 +128,28 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}}
 
 install C/7zip/Compress/LZMA_Alone/lzma $RPM_BUILD_ROOT%{_bindir}
 install C/7zip/Compress/LZMA_Lib/liblzma.a $RPM_BUILD_ROOT%{_libdir}
+install C/7zip/Compress/LZMA_Lib/liblzma.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
+ln -s $(cd C/7zip/Compress/LZMA_Lib; echo liblzma.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/liblzma.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc history.txt lzma.txt
 %attr(755,root,root) %{_bindir}/*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/liblzma.so.*.*
+
 %files devel
 %defattr(644,root,root,755)
+%{_libdir}/liblzma.so
+
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/liblzma.a