dmraid: Increase release number.

[people/amarx/ipfire-3.x.git] / dmraid / dmraid.nm

diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm
index a8d2a04f957fd1bfd0f968832bdf785fcbb1c381..f3d6c31c125b9515a35b6c74733bdb7a8d2e8b76 100644 (file)
--- a/dmraid/dmraid.nm
+++ b/dmraid/dmraid.nm
@@ -5,7 +5,7 @@
 
 name       = dmraid
 version    = 1.0.0.rc15
-release    = 3
+release    = 5
 
 groups     = System/Filesystems
 url        = http://people.redhat.com/heinzm/sw/dmraid
@@ -30,28 +30,29 @@ build
        DIR_APP = %{DIR_SRC}/%{name}/%{version}
        PARALLELISMFLAGS = # Disabled
 
-       make_install_targets += sbindir=%{BUILDROOT}/sbin
+       make_install_targets += sbindir=%{BUILDROOT}%{sbindir}
 
        configure_options += \
-               --sbindir=/sbin \
-               --libdir=/%{lib} \
                --disable-static \
                --disable-static_link \
                --enable-libselinux
 
+       # Dmraid doesn't automatically build and install a versioned library
+       # so we do it on or own.
        build_cmds
                make -C lib libdmraid.so
        end
 
        install_cmds
-               mkdir -pv %{BUILDROOT}/{,usr}/%{lib}
-               install -v -m 755 lib/libdmraid.so \
-                       %{BUILDROOT}/%{lib}/libdmraid.so.%{version}
-               ln -svf ../../%{lib}/libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so
-
                # Install development headers.
                mkdir -pv %{BUILDROOT}%{includedir}/dmraid
                install -m 644 include/dmraid/*.h %{BUILDROOT}%{includedir}/dmraid/
+
+               # Manually install versioned library and create symlinks.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -m 755 lib/libdmraid.so %{BUILDROOT}%{libdir}/libdmraid.so.%{version}
+               ln -sv libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so.1
+               ln -sv libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so
        end
 end