Explorar el Código

require glib::with_threads and correct Makefile's wrong install command path

Michael Schloh von Bennewitz hace 22 años
padre
commit
70ee7116c6
Se han modificado 1 ficheros con 6 adiciones y 7 borrados
  1. 6 7
      ripe-dbase/ripe-dbase.spec

+ 6 - 7
ripe-dbase/ripe-dbase.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [JUNK]
 Group:        Database
 License:      RIPE NCC
 Version:      3.2.0
-Release:      20031127
+Release:      20031205
 
 #   list of sources
 Source0:      ftp://ftp.ripe.net/ripe/dbase/software/ripe-dbase-%{version}.tar.gz
@@ -49,8 +49,10 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20030103, make, gcc
 PreReq:       OpenPKG, openpkg >= 20030103
-BuildPreReq:  gnupg, glib, mysql, libxml, libxslt, imap, zlib, openssl
-PreReq:       gnupg, glib, mysql, libxml, libxslt, imap, zlib, openssl
+BuildPreReq:  gnupg, glib, glib::with_threads = yes, mysql
+BuildPreReq:  libxml, libxslt, imap, zlib, openssl
+PreReq:       gnupg, glib, glib::with_threads = yes, mysql
+PreReq:       libxml, libxslt, imap, zlib, openssl
 AutoReq:      no
 AutoReqProv:  no
 
@@ -62,15 +64,12 @@ AutoReqProv:  no
     %patch -p0
 
 %build
-    ( echo "ac_cv_path_install='shtool install -c'"
-    ) >config.cache
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
     LIBS="-lssl -lcrypto" \
     ./configure \
-        --cache-file=./config.cache \
         --prefix=%{l_prefix} \
         --with-glibconfig=%{l_prefix}/bin/glib-config \
         --with-mysql=%{l_prefix} \
@@ -89,7 +88,7 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e "s;^\\([^=]* *= *\\)%{l_prefix};\\1$RPM_BUILD_ROOT%{l_prefix};" \
         Makefile
-    %{l_make} %{l_mflags} install
+    %{l_make} %{l_mflags} install INSTALL="%{l_shtool} install -c"
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}