Bladeren bron

move replace-utility out of the way, move mysqld into package-private libexecdir

Michael van Elst 23 jaren geleden
bovenliggende
commit
e4ed078799
2 gewijzigde bestanden met toevoegingen van 15 en 2 verwijderingen
  1. 8 0
      mysql4/mysql4.patch
  2. 7 2
      mysql4/mysql4.spec

File diff suppressed because it is too large
+ 8 - 0
mysql4/mysql4.patch


+ 7 - 2
mysql4/mysql4.spec

@@ -40,7 +40,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20030205
+Release:      20030211
 
 #   package options
 %option       with_berkeleydb  yes
@@ -113,6 +113,7 @@ Conflicts:    mysql
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/%{name} \
         --localstatedir=%{l_prefix}/var/%{name} \
+        --libexecdir=%{l_prefix}/libexec/%{name} \
         --with-unix-socket-path=%{l_prefix}/var/%{name}/mysql.sock \
         --with-mysqld-user=%{l_musr} \
         --enable-thread-safe-client \
@@ -142,6 +143,10 @@ Conflicts:    mysql
         AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
         DESTDIR=$RPM_BUILD_ROOT
 
+    #   move utility 'replace', msql2mysql is patched for new path
+    mv $RPM_BUILD_ROOT%{l_prefix}/bin/replace \
+       $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}
+
     #   strip installation area
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/mysql-test
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/sql-bench
@@ -149,7 +154,7 @@ Conflicts:    mysql
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/%{name}/mysql-%{V_mysql}.spec
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/%{name}/binary-configure
     strip  $RPM_BUILD_ROOT%{l_prefix}/bin/*     2>/dev/null || true
-    strip  $RPM_BUILD_ROOT%{l_prefix}/libexec/* 2>/dev/null || true
+    strip  $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/* 2>/dev/null || true
 
     #   install global configuration
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}