Clean up packaging and supply libdl library needed for Linux builds.

Wed, 07 Jan 2009 15:03:34 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 07 Jan 2009 15:03:34 +0100
changeset 26
89094e16ef70
parent 25
d347f9d0cfb2
child 27
302190459977

Clean up packaging and supply libdl library needed for Linux builds.

aqmoney/aqmoney.spec file | annotate | diff | comparison | revisions
     1.1 --- a/aqmoney/aqmoney.spec	Wed Jan 07 15:02:43 2009 +0100
     1.2 +++ b/aqmoney/aqmoney.spec	Wed Jan 07 15:03:34 2009 +0100
     1.3 @@ -36,7 +36,7 @@
     1.4  Group:        Finance
     1.5  License:      GPL
     1.6  Version:      %{V_aqmoney}
     1.7 -Release:      20080813
     1.8 +Release:      20090106
     1.9  
    1.10  #   list of sources
    1.11  Source0:      http://switch.dl.sourceforge.net/aqmoney/aqmoney2-%{V_aqmoney}.tar.gz
    1.12 @@ -90,11 +90,17 @@
    1.13        %{l_make} %{l_mflags -O}
    1.14  
    1.15        #   pre-install it and adjust for temporary usage by AqMoney build (below)
    1.16 -      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
    1.17 +      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    1.18      ) || exit $?
    1.19  
    1.20      #   configure and build program
    1.21      ( cd aqmoney2-%{version}
    1.22 +      loclibs=''
    1.23 +      case "%{l_platform -t}" in
    1.24 +          *-linux* )
    1.25 +              loclibs='-ldl'
    1.26 +              ;;
    1.27 +      esac
    1.28        %{l_shtool} subst \
    1.29            -e 's;ktoblzcheck_datafile="";;' \
    1.30            configure
    1.31 @@ -104,6 +110,7 @@
    1.32        CXXFLAGS="%{l_cxxflags -O}" \
    1.33        CPPFLAGS="%{l_cppflags}" \
    1.34        LDFLAGS="%{l_ldflags}" \
    1.35 +      LIBS="-lintl -liconv $loclibs" \
    1.36        ./configure \
    1.37            --prefix=%{l_prefix} \
    1.38            --with-openhbci-prefix=%{l_prefix} \
    1.39 @@ -120,10 +127,10 @@
    1.40  
    1.41      #   install programs
    1.42      ( cd ktoblzcheck-%{V_ktoblzcheck}
    1.43 -      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
    1.44 +      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    1.45      ) || exit $?
    1.46      ( cd aqmoney2-%{version}
    1.47 -      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
    1.48 +      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    1.49      ) || exit $?
    1.50  
    1.51      #   workaround problems with AqHBCI plugin run-time

mercurial