/[packages]/cauldron/mariadb/pristine/SPECS/mariadb.spec
ViewVC logotype

Diff of /cauldron/mariadb/pristine/SPECS/mariadb.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 589225 by oden, Tue Feb 11 10:03:43 2014 UTC revision 593844 by oden, Mon Feb 17 14:54:17 2014 UTC
# Line 90  Source68:      semisync_master.cnf Line 90  Source68:      semisync_master.cnf
90  Source69:       semisync_slave.cnf  Source69:       semisync_slave.cnf
91  Source70:       sql_errlog.cnf  Source70:       sql_errlog.cnf
92  Source71:       feedback.cnf  Source71:       feedback.cnf
93    Source72:       ha_xtradb.cnf
94    
95  # the following patches are rediffed from the mysql-5.5 src.rpm to mariadb-5.5  # the following patches are rediffed from the mysql-5.5 src.rpm to mariadb-5.5
96  # fedora patches  # fedora patches
# Line 490  rm -f mysql-test/t/file_contents.test Line 491  rm -f mysql-test/t/file_contents.test
491  # fix distribution name  # fix distribution name
492  sed -i 's/Source distribution/%{_vendor} MariaDB Server/' mysql-test/suite/percona/innodb_sys_index.result  sed -i 's/Source distribution/%{_vendor} MariaDB Server/' mysql-test/suite/percona/innodb_sys_index.result
493    
 # static xtradb  
 perl -pi -e "s|MODULE_ONLY||g" storage/xtradb/CMakeLists.txt  
   
494  %build  %build
495    
496  ## MariaDB  ## MariaDB
# Line 541  export FFLAGS="${FFLAGS:-%{optflags}}" Line 539  export FFLAGS="${FFLAGS:-%{optflags}}"
539      -DWITHOUT_NDBCLUSTER_STORAGE_ENGINE=1 \      -DWITHOUT_NDBCLUSTER_STORAGE_ENGINE=1 \
540      -DWITHOUT_DAEMON_EXAMPLE=1 \      -DWITHOUT_DAEMON_EXAMPLE=1 \
541      -DWITH_PLUGIN_PBXT=0 \      -DWITH_PLUGIN_PBXT=0 \
     -DWITH_XTRADB=1 \  
     -DWITHOUT_INNOBASE=1 \  
542      -DFEATURE_SET="community" \      -DFEATURE_SET="community" \
543      -DRPM=1 \      -DRPM=1 \
544      -DCOMPILATION_COMMENT="%{_vendor} MariaDB Server"      -DCOMPILATION_COMMENT="%{_vendor} MariaDB Server"
# Line 583  rm -f %{buildroot}%{_sysconfdir}/my.cnf. Line 579  rm -f %{buildroot}%{_sysconfdir}/my.cnf.
579    
580  # magic by anssi  # magic by anssi
581  pushd %{buildroot}%{_sysconfdir}/my.cnf.d  pushd %{buildroot}%{_sysconfdir}/my.cnf.d
582  %{expand:%(for i in {50..71}; do echo "install -m 644 %%SOURCE$i ."; done)}  %{expand:%(for i in {50..72}; do echo "install -m 644 %%SOURCE$i ."; done)}
583  popd  popd
584    
585  # bork  # bork
# Line 776  fi Line 772  fi
772  %config(noreplace) %{_sysconfdir}/my.cnf.d/ha_federatedx.cnf  %config(noreplace) %{_sysconfdir}/my.cnf.d/ha_federatedx.cnf
773  # sql logging plugin  # sql logging plugin
774  %config(noreplace) %{_sysconfdir}/my.cnf.d/sql_errlog.cnf  %config(noreplace) %{_sysconfdir}/my.cnf.d/sql_errlog.cnf
775    %config(noreplace) %{_sysconfdir}/my.cnf.d/ha_xtradb.cnf
776  # new since 10.x  # new since 10.x
777  %config(noreplace) %{_sysconfdir}/my.cnf.d/locales.cnf  %config(noreplace) %{_sysconfdir}/my.cnf.d/locales.cnf
778  %config(noreplace) %{_sysconfdir}/my.cnf.d/metadata_lock_info.cnf  %config(noreplace) %{_sysconfdir}/my.cnf.d/metadata_lock_info.cnf
# Line 800  fi Line 797  fi
797  %{_libdir}/mysql/plugin/ha_federatedx.so  %{_libdir}/mysql/plugin/ha_federatedx.so
798  # sql logging plugin  # sql logging plugin
799  %{_libdir}/mysql/plugin/sql_errlog.so  %{_libdir}/mysql/plugin/sql_errlog.so
800    %{_libdir}/mysql/plugin/ha_xtradb.so
801  # new since 10.x  # new since 10.x
 # %%{_libdir}/mysql/plugin/ha_xtradb.so  
802  %{_libdir}/mysql/plugin/locales.so  %{_libdir}/mysql/plugin/locales.so
803  %{_libdir}/mysql/plugin/metadata_lock_info.so  %{_libdir}/mysql/plugin/metadata_lock_info.so
804  %{_libdir}/mysql/plugin/query_response_time.so  %{_libdir}/mysql/plugin/query_response_time.so
Legend:
Removed from v.589225  
changed lines
  Added in v.593844
  ViewVC Help
Powered by ViewVC 1.1.30