Browse Source

cleanup and fix building of Perl part

Ralf S. Engelschall 21 years ago
parent
commit
1149a286a2
1 changed files with 3 additions and 5 deletions
  1. 3 5
      geoip/geoip.spec

+ 3 - 5
geoip/geoip.spec

@@ -38,7 +38,7 @@ Class:        PLUS
 Group:        Network
 Group:        Network
 License:      GPL
 License:      GPL
 Version:      %{V_api_c}
 Version:      %{V_api_c}
-Release:      20040421
+Release:      20040509
 
 
 #   package options
 #   package options
 %option       with_perl   no
 %option       with_perl   no
@@ -100,8 +100,8 @@ AutoReqProv:  no
 %if "%{with_perl}" == "yes"
 %if "%{with_perl}" == "yes"
     %{l_prefix}/bin/perl-openpkg prepare
     %{l_prefix}/bin/perl-openpkg prepare
     %{l_prefix}/bin/perl-openpkg -d Geo-IP-%{V_api_pl} --verbose \
     %{l_prefix}/bin/perl-openpkg -d Geo-IP-%{V_api_pl} --verbose \
-        --args LIBS="-LlibGeoIP/.libs" \
-        --args INC="-IlibGeoIP" \
+        --args LIBS="-L../libGeoIP/.libs" \
+        --args INC="-I../libGeoIP" \
         configure build
         configure build
 %endif
 %endif
 
 
@@ -113,8 +113,6 @@ AutoReqProv:  no
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
 %if "%{with_perl}" == "yes"
 %if "%{with_perl}" == "yes"
     %{l_prefix}/bin/perl-openpkg -d Geo-IP-%{V_api_pl} install
     %{l_prefix}/bin/perl-openpkg -d Geo-IP-%{V_api_pl} install
-    find ${RPM_BUILD_ROOT}${l_prefix} -name perllocal.pod -print | xargs rm -f
-    find ${RPM_BUILD_ROOT}${l_prefix} -name .packlist -print | xargs rm -f
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files install fixate cleanup
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files install fixate cleanup
 %else
 %else
     >perl-openpkg-files
     >perl-openpkg-files