Explorar el Código

mysql3 is a 'faked' package for mysql (and not an 'alternative' package as our definition states), so configure it and use it this way

Ralf S. Engelschall hace 23 años
padre
commit
090c60b8a7

+ 3 - 3
apache/apache.spec

@@ -60,7 +60,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20030703
+Release:      20030704
 
 #   package options (suexec related)
 %option       with_suexec               yes
@@ -203,7 +203,7 @@ PreReq:       perl
 %if "%{with_mod_php}" == "yes"
 BuildPreReq:  gcc, sed, flex, bison
 %if "%{with_mod_php_mysql}" == "yes"
-BuildPreReq:  MYSQL
+BuildPreReq:  mysql
 %endif
 %if "%{with_mod_php_gd}" == "yes"
 BuildPreReq:  gd, jpeg, png
@@ -277,7 +277,7 @@ BuildPreReq:  gd
 BuildPreReq:  jpeg
 %endif
 %if "%{with_mod_php3_mysql}" == "yes"
-BuildPreReq:  MYSQL
+BuildPreReq:  mysql
 %endif
 %if "%{with_mod_php3_openssl}" == "yes"
 BuildPreReq:  openssl

+ 4 - 4
bind/bind.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
 Group:        DNS
 License:      ISC
 Version:      %{V_bind}
-Release:      20030606
+Release:      20030704
 
 #   package options
 %option       with_dlz_mysql      no
@@ -72,8 +72,8 @@ BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20021002, make, openssl
 PreReq:       OpenPKG, openpkg >= 20021002
 %if "%{with_dlz_mysql}" == "yes"
-BuildPreReq:  MYSQL
-PreReq:       MYSQL
+BuildPreReq:  mysql
+PreReq:       mysql
 %endif
 %if "%{with_dlz_postgres}" == "yes"
 BuildPreReq:  postgresql
@@ -105,7 +105,7 @@ Conflicts:    bind8
     #
     %{l_patch} -p1 <dlz.patch
     #
-    #   fix up DLZ link libraries for MYSQL and Postgres
+    #   fix up DLZ link libraries for MySQL and PostgreSQL
     %{l_shtool} subst \
         -e '/-lmysqlclient/s;-l\(nsl\|z\|crypt\|m\)\( \|"\);\2;g' \
         -e 's;\(-lpq\);\1 -lssl -lcrypto;g' \

+ 2 - 2
myodbc/myodbc.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Database
 License:      GPL
 Version:      3.51.06
-Release:      20030227
+Release:      20030704
 
 #   list of sources
 Source0:      http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MyODBC3/MyODBC-%{version}.tar.gz
@@ -41,7 +41,7 @@ Source0:      http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MyODBC3/M
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, MYSQL, unixodbc, make
+BuildPreReq:  OpenPKG, openpkg >= 20020206, mysql, unixodbc, make
 PreReq:       OpenPKG, openpkg >= 20020206
 AutoReq:      no
 AutoReqProv:  no

+ 1 - 3
mysql/mysql.spec

@@ -39,7 +39,7 @@ Distribution: OpenPKG [BASE]
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20030609
+Release:      20030704
 
 #   package options
 %option       with_berkeleydb  yes
@@ -59,8 +59,6 @@ BuildPreReq:  OpenPKG, openpkg >= 20030103, gcc, zlib
 PreReq:       OpenPKG, openpkg >= 20030103, zlib
 AutoReq:      no
 AutoReqProv:  no
-Provides:     MYSQL
-Conflicts:    mysql3
 
 %description
     MySQL is a multi-user Relational Database Management System (RDBMS),

+ 2 - 3
mysql3/mysql3.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Database
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20030620
+Release:      20030704
 
 #   package options
 %option       with_berkeleydb  yes
@@ -58,8 +58,7 @@ BuildPreReq:  OpenPKG, openpkg >= 20030103, gcc, zlib
 PreReq:       OpenPKG, openpkg >= 20030103, zlib
 AutoReq:      no
 AutoReqProv:  no
-Provides:     MYSQL
-Conflicts:    mysql
+Provides:     mysql = %{version}-%{release}
 
 %description
     MySQL is a multi-user Relational Database Management System (RDBMS),

+ 4 - 4
perl-dbi/perl-dbi.spec

@@ -43,8 +43,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [BASE]
 Group:        Language
 License:      GPL/Artistic
-Version:      20030701
-Release:      20030701
+Version:      20030704
+Release:      20030704
 
 #   package options
 %option       with_dbd_mysql   no
@@ -70,8 +70,8 @@ BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20030103, perl, perl-openpkg, perl-net
 PreReq:       OpenPKG, openpkg >= 20030103, perl, perl-openpkg, perl-net
 %if "%{with_dbd_mysql}" == "yes"
-BuildPreReq:  MYSQL
-PreReq:       MYSQL
+BuildPreReq:  mysql
+PreReq:       mysql
 %endif
 %if "%{with_dbd_pg}" == "yes"
 BuildPreReq:  postgresql

+ 2 - 2
php/php.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Language
 License:      PHP
 Version:      4.3.2
-Release:      20030702
+Release:      20030704
 
 #   package options (analog to apache.spec)
 %option       with_calendar      no
@@ -87,7 +87,7 @@ BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc, sed, flex, bison
 PreReq:       OpenPKG, openpkg >= 20020206
 %if "%{with_mysql}" == "yes"
-BuildPreReq:  MYSQL
+BuildPreReq:  mysql
 %endif
 %if "%{with_gd}" == "yes"
 BuildPreReq:  gd, jpeg, png

+ 3 - 3
postfix/postfix.spec

@@ -39,7 +39,7 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      IPL
 Version:      %{V_postfix}
-Release:      20030702
+Release:      20030704
 
 #   package options
 %option       with_fsl       yes
@@ -77,8 +77,8 @@ BuildPreReq:  sasl
 PreReq:       sasl
 %endif
 %if "%{with_mysql}" == "yes"
-BuildPreReq:  MYSQL
-PreReq:       MYSQL
+BuildPreReq:  mysql
+PreReq:       mysql
 %endif
 %if "%{with_ldap}" == "yes"
 BuildPreReq:  openldap, openssl

+ 4 - 8
powerdns/powerdns.spec

@@ -35,7 +35,7 @@ Distribution: OpenPKG [JUNK]
 Group:        DNS
 License:      GPL
 Version:      2.9.10
-Release:      20030703
+Release:      20030704
 
 #   package options
 %option       with_fsl   yes
@@ -53,21 +53,17 @@ Source3:      powerdnssetup
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20030415
+PreReq:       OpenPKG, openpkg >= 20030415
 %if "%{with_fsl}" == "yes"
 BuildPreReq:  fsl
 PreReq:       fsl
 %endif
 %if "%{with_mysql}" == "yes"
-BuildPreReq:  MYSQL
+BuildPreReq:  mysql
+PreReq:       mysql
 %endif
 %if "%{with_pgsql}" == "yes"
 BuildPreReq:  postgresql, postgresql::with_cxx = yes
-%endif
-PreReq:       OpenPKG, openpkg >= 20030415
-%if "%{with_mysql}" == "yes"
-PreReq:       MYSQL
-%endif
-%if "%{with_pgsql}" == "yes"
 PreReq:       postgresql, postgresql::with_cxx = yes
 %endif
 AutoReq:      no

+ 2 - 2
proftpd/proftpd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        FTP
 License:      GPL
 Version:      1.2.8
-Release:      20030702
+Release:      20030704
 
 #   package options
 %option       with_mysql  no
@@ -60,7 +60,7 @@ BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20030103, ncurses, getopt, make
 PreReq:       OpenPKG, openpkg >= 20030103, ncurses
 %if "%{with_mysql}" == "yes"
-BuildPreReq:  MYSQL
+BuildPreReq:  mysql
 %endif
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM

+ 2 - 2
rt/rt.spec

@@ -49,7 +49,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Database
 License:      GPL
 Version:      %{V_here}
-Release:      20030630
+Release:      20030704
 
 #   package options
 %option       with_color_primary   336699
@@ -102,7 +102,7 @@ PreReq:       perl-sys, perl-util, perl-ds, perl-text, perl-apache
 PreReq:       perl-dbi, perl-dbix, perl-mail, perl-www
 PreReq:       apache, apache::with_mod_perl = yes
 %if "%{with_db_mysql}" == "yes"
-PreReq:       MYSQL, perl-dbi::with_dbd_mysql = yes
+PreReq:       mysql, perl-dbi::with_dbd_mysql = yes
 %endif
 %if "%{with_db_postgresql}" == "yes"
 PreReq:       postgresql, perl-dbi::with_dbd_pg = yes

+ 1 - 1
sasl/sasl.spec

@@ -66,7 +66,7 @@ PreReq:       PAM
 BuildPreReq:  openldap
 %endif
 %if "%{with_mysql}" == "yes"
-BuildPreReq:  MYSQL
+BuildPreReq:  mysql
 %endif
 AutoReq:      no
 AutoReqProv:  no

+ 2 - 2
sendmail/sendmail.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      BSD
 Version:      8.12.9
-Release:      20030629
+Release:      20030704
 
 #   package options
 %option       with_fsl      yes
@@ -70,7 +70,7 @@ BuildPreReq:  sasl, openssl
 BuildPreReq:  openldap, openssl
 %endif
 %if "%{with_mysql}" == "yes"
-BuildPreReq:  MYSQL
+BuildPreReq:  mysql
 %endif
 AutoReq:      no
 AutoReqProv:  no