]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
popt: Make package work on x86_64.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 13:46:48 +0000 (14:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 13:46:48 +0000 (14:46 +0100)
popt/popt.nm

index 9407ce2da0bff89615f6e88e35fcabff5310f77a..5bf894aacd65e655730c2bbab0f8ab931e2ae7e0 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = popt
 version    = 1.15
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.rpm5.org/
@@ -22,18 +22,17 @@ source_dl  =
 
 build
        configure_options += \
-               --libdir=/lib \
+               --libdir=/%{lib}
 
        install_cmds
-               mkdir -pv %{BUILDROOT}/usr/lib
-               rm -vf %{BUILDROOT}/lib/libpopt.so
-               ln -sfv ../../lib/libpopt.so.0.0.0 %{BUILDROOT}/usr/lib/libpopt.so
+               mkdir -pv %{BUILDROOT}%{libdir}
+               rm -vf %{BUILDROOT}/%{lib}/libpopt.so
+               ln -sfv ../../%{lib}/libpopt.so.0.0.0 %{BUILDROOT}%{libdir}/libpopt.so
        end
 end
 
 packages
        package %{name}
-       end
 
        package %{name}-devel
                template DEVEL