]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
libsepol: Make package work on x86_64.
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 17 Mar 2012 10:07:17 +0000 (11:07 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 24 Mar 2012 07:28:41 +0000 (08:28 +0100)
Conflicts:

libsepol/libsepol.nm

libsepol/libsepol.nm

index 805918685dc1f7b3b82879da9d8a6bdb5393eb5b..19042fd00a7cbc8162a0778e92d44eea1bfb9dca 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = libsepol
 version    = 2.1.4
-release    = 3
+release    = 4
 
 groups     = System/Libraries
 url        = http://www.selinuxproject.org
@@ -22,14 +22,16 @@ sources    = %{thisapp}.tgz
 build
        # Keep static libsepol.a for some selinux tools, that needs to link 
        # against it. We will put it into an own package.
-       keep_libraries = /usr/lib/libsepol.a
+       keep_libraries = %{libdir}/libsepol.a
 
        build
                make clean
                make CFLAGS="%{CFLAGS}" %{PARALELLISMFLAGS}
        end
 
-       make_install_targets += LIBDIR="%{BUILDROOT}%{libdir}" \
+       # Install libraries to correct place.
+       make_install_targets += \
+               LIBDIR="%{BUILDROOT}%{libdir}" \
                SHLIBDIR="%{BUILDROOT}/%{lib}"
 
        install_cmds
@@ -58,7 +60,7 @@ packages
                groups = Development/Libraries
 
                files
-                       /usr/lib/libsepol.a
+                       %{libdir}/libsepol.a
                end
        end
 end