xz: Move compat libraries into own package.

Fixes #10751.

diff --git a/compat-xz/compat-xz.nm b/compat-xz/compat-xz.nm
new file mode 100644 (file)
index 0000000..9acf280
--- /dev/null
+++ b/compat-xz/compat-xz.nm
@@ -0,0 +1,62 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-xz
+version    = 4.999.9beta
+release    = 1
+
+thisapp = xz-%{version}
+
+groups     = Applications/Compression
+url        = http://tukaani.org/xz/
+license    = LGPLv2+
+summary    = LZMA Utils.
+
+description
+       LZMA provides very high compression ratio and fast decompression. The
+       core of the LZMA utils is Igor Pavlov's LZMA SDK containing the actual
+       LZMA encoder/decoder. LZMA utils add a few scripts which provide
+       gzip-like command line interface and a couple of other LZMA related
+       tools.
+end
+
+source_dl  = http://tukaani.org/xz/
+sources    = %{thisapp}.tar.xz
+
+build
+       configure_options += \
+               --disable-rpath
+
+       test
+               export LD_LIBRARY_PATH=$(pwd)/src/liblzma/.libs
+               make check
+       end
+
+       install
+               # Only install libraries.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}%{libdir}
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       xz = %{thisver}
+               end
+
+               obsoletes
+                       xz-compat
+               end
+
+               conflicts
+                       xz <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/xz/xz.nm b/xz/xz.nm
index d7b042a39502732e205350f423c014c017edb93d..d27da325600e86bc22b2710620b1d7f71ec59e56 100644 (file)
--- a/xz/xz.nm
+++ b/xz/xz.nm
@@ -4,48 +4,33 @@
 ###############################################################################
 
 name       = xz
-version    = 5.2.0
+version    = 5.2.1
 release    = 1
 
-compat_version = 4.999.9beta
-
 groups     = Applications/Compression
 url        = http://tukaani.org/xz/
 license    = LGPLv2+
 summary    = LZMA Utils.
 
 description
-       LZMA provides very high compression ratio and fast decompression. The \
-       core of the LZMA utils is Igor Pavlov's LZMA SDK containing the actual \
-       LZMA encoder/decoder. LZMA utils add a few scripts which provide \
-       gzip-like command line interface and a couple of other LZMA related \
+       LZMA provides very high compression ratio and fast decompression. The
+       core of the LZMA utils is Igor Pavlov's LZMA SDK containing the actual
+       LZMA encoder/decoder. LZMA utils add a few scripts which provide
+       gzip-like command line interface and a couple of other LZMA related
        tools.
 end
 
 source_dl  = http://tukaani.org/xz/
-sources    = %{thisapp}.tar.xz %{name}-%{compat_version}.tar.xz
+sources    = %{thisapp}.tar.xz
 
 build
-       configure_options += --disable-rpath
-
-       build_cmds
-               # Build compat version of library.
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               ./configure %{configure_options}
-               %{MACRO_FIX_LIBTOOL}
-               make %{PARALLELISMFLAGS}
-       end
+       configure_options += \
+               --disable-rpath
 
        test
                export LD_LIBRARY_PATH=$(pwd)/src/liblzma/.libs
                make check
        end
-
-       install_cmds
-               # Install comapt version of library.
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}%{libdir}
-       end
 end
 
 packages
@@ -80,14 +65,6 @@ packages
                end
        end
 
-       package xz-compat-libs
-               summary = Compatibility version of %{name} (%{compat_version}).
-
-               files
-                       %{libdir}/lib*.so.0*
-               end
-       end
-
        package %{name}-debuginfo
                template DEBUGINFO
        end