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

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

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

revision 434194 by blino, Tue May 28 16:51:31 2013 UTC revision 434195 by alien, Sat Jun 1 15:05:50 2013 UTC
# Line 60  URL:           http://mariadb.org/ Line 60  URL:           http://mariadb.org/
60  Source0:        %{mirror}/%{name}-%{version}/kvm-tarbake-jaunty-x86/%{name}-%{version}.tar.gz  Source0:        %{mirror}/%{name}-%{version}/kvm-tarbake-jaunty-x86/%{name}-%{version}.tar.gz
61  Source2:        mysqld.sysconfig  Source2:        mysqld.sysconfig
62  Source3:        my.cnf  Source3:        my.cnf
 Source4:        libmysql.version  
63  Source10:       mysql.tmpfiles.d  Source10:       mysql.tmpfiles.d
64  Source11:       mysqld.service  Source11:       mysqld.service
65  Source12:       mysqld-prepare-db-dir  Source12:       mysqld-prepare-db-dir
# Line 70  Source13:      mysqld-wait-ready Line 69  Source13:      mysqld-wait-ready
69  Patch1:         mariadb-5.5-errno.patch  Patch1:         mariadb-5.5-errno.patch
70  Patch3:         mariadb-5.5-install-test.patch  Patch3:         mariadb-5.5-install-test.patch
71  Patch4:         mysql-expired-certs.patch  Patch4:         mysql-expired-certs.patch
 Patch8:         mariadb-5.5-dubious-exports.patch  
72    
73  # mandriva patches  # mandriva patches
74  Patch101:       mariadb-5.5-logrotate.patch  Patch101:       mariadb-5.5-logrotate.patch
 Patch102:       mariadb-5.5-initscript.patch  
75  Patch106:       mariadb-5.5-hotcopy.patch  Patch106:       mariadb-5.5-hotcopy.patch
76  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch
77    
# Line 368  rm -f mysql-test/t/file_contents.test Line 365  rm -f mysql-test/t/file_contents.test
365  # fix distribution name  # fix distribution name
366  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
367    
 # upstream has fallen down badly on symbol versioning, do it ourselves  
 cp %{SOURCE4} libmysql/libmysql.version  
   
368  %build  %build
369  %serverbuild  %serverbuild
370  export CFLAGS="${CFLAGS:-%{optflags}}"  export CFLAGS="${CFLAGS:-%{optflags}}"
# Line 417  export FFLAGS="${FFLAGS:-%{optflags}}" Line 411  export FFLAGS="${FFLAGS:-%{optflags}}"
411      -DWITHOUT_DAEMON_EXAMPLE=1 \      -DWITHOUT_DAEMON_EXAMPLE=1 \
412      -DWITH_PLUGIN_PBXT=0 \      -DWITH_PLUGIN_PBXT=0 \
413      -DFEATURE_SET="community" \      -DFEATURE_SET="community" \
414        -DRPM=1 \
415      -DCOMPILATION_COMMENT="%{_vendor} MariaDB Server"      -DCOMPILATION_COMMENT="%{_vendor} MariaDB Server"
416    
 cp ../libmysql/libmysql.version libmysql/libmysql.version  
   
417  %make  %make
418    
419  %install  %install
# Line 434  export DONT_STRIP=1 Line 427  export DONT_STRIP=1
427  %endif  %endif
428    
429  install -d %{buildroot}%{_sysconfdir}/sysconfig  install -d %{buildroot}%{_sysconfdir}/sysconfig
 install -d %{buildroot}%{_initrddir}  
430  install -d %{buildroot}%{_var}/log/mysqld  install -d %{buildroot}%{_var}/log/mysqld
431  install -d %{buildroot}/var/lib/mysql/{mysql,test}  install -d %{buildroot}/var/lib/mysql/{mysql,test}
432    
# Line 443  install -d %{buildroot}/var/lib/mysql/{m Line 435  install -d %{buildroot}/var/lib/mysql/{m
435  # exclude loaddata7 from being converted  # exclude loaddata7 from being converted
436  export EXCLUDE_FROM_EOL_CONVERSION="std_data/loaddata7.dat"  export EXCLUDE_FROM_EOL_CONVERSION="std_data/loaddata7.dat"
437    
 # install init scripts  
 install -m0755 build/support-files/mysql.server %{buildroot}%{_initrddir}/mysqld  
   
438  # install configuration files  # install configuration files
439  install -m0644 Mageia/mysqld.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/mysqld  install -m0644 Mageia/mysqld.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/mysqld
440  install -m0644 Mageia/my.cnf %{buildroot}%{_sysconfdir}/my.cnf  install -m0644 Mageia/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
# Line 458  install -m 0755 %{SOURCE13} %{buildroot} Line 447  install -m 0755 %{SOURCE13} %{buildroot}
447  # bork  # bork
448  mv %{buildroot}%{_bindir}/mysqlaccess.conf %{buildroot}%{_sysconfdir}/  mv %{buildroot}%{_bindir}/mysqlaccess.conf %{buildroot}%{_sysconfdir}/
449  chmod 644 %{buildroot}%{_sysconfdir}/mysqlaccess.conf  chmod 644 %{buildroot}%{_sysconfdir}/mysqlaccess.conf
 mv %{buildroot}%{_prefix}/scripts/mysql_install_db %{buildroot}%{_bindir}/  
450  mv %{buildroot}%{_datadir}/mysql/aclocal %{buildroot}%{_datadir}/aclocal  mv %{buildroot}%{_datadir}/mysql/aclocal %{buildroot}%{_datadir}/aclocal
451    
452  pushd %{buildroot}%{_bindir}  pushd %{buildroot}%{_bindir}
# Line 517  rm -f %{buildroot}%{_libdir}/mysql/plugi Line 505  rm -f %{buildroot}%{_libdir}/mysql/plugi
505    
506  # no RHEL4 selinux files for us  # no RHEL4 selinux files for us
507  rm -rf %{buildroot}%{_datadir}/mysql/SELinux  rm -rf %{buildroot}%{_datadir}/mysql/SELinux
508    # no init script for us
509    rm -f %{buildroot}%{_initrddir}/mysql
510    rm -f %{buildroot}%{_initrddir}/mysqld
511    # no split up config yet
512    rm -rf %{buildroot}%{_sysconfdir}/my.cnf.d
513    
514  # house cleaning  # house cleaning
515  rm -rf %{buildroot}%{_datadir}/info  rm -rf %{buildroot}%{_datadir}/info
# Line 540  rm -f %{buildroot}%{_datadir}/mysql/magi Line 533  rm -f %{buildroot}%{_datadir}/mysql/magi
533  rm -rf %{buildroot}%{_prefix}/data  rm -rf %{buildroot}%{_prefix}/data
534  rm -rf %{buildroot}%{_prefix}/docs  rm -rf %{buildroot}%{_prefix}/docs
535  rm -rf %{buildroot}%{_prefix}/scripts  rm -rf %{buildroot}%{_prefix}/scripts
536  rm -f %{buildroot}%{_prefix}/COPYING  rm -rf %{buildroot}%{_datadir}/doc
537  rm -f %{buildroot}%{_prefix}/COPYING.LESSER  rm -rf %{buildroot}%{_sysconfdir}/init.d/mysql
538  rm -f %{buildroot}%{_prefix}/INSTALL-BINARY  rm -rf %{buildroot}%{_sysconfdir}/logrotate.d/mysql
 rm -f %{buildroot}%{_prefix}/README  
539    
540  %multiarch_binaries %{buildroot}%{_bindir}/mysql_config  %multiarch_binaries %{buildroot}%{_bindir}/mysql_config
541  %multiarch_includes %{buildroot}%{_includedir}/mysql/my_config.h  %multiarch_includes %{buildroot}%{_includedir}/mysql/my_config.h
# Line 639  fi Line 631  fi
631    
632  %files  %files
633  %doc README.urpmi  %doc README.urpmi
 %{_initrddir}/mysqld  
634  %{_tmpfilesdir}/mysql.conf  %{_tmpfilesdir}/mysql.conf
635  %{_unitdir}/mysqld.service  %{_unitdir}/mysqld.service
636  %{_sbindir}/mysqld-prepare-db-dir  %{_sbindir}/mysqld-prepare-db-dir
637  %{_sbindir}/mysqld-wait-ready  %{_sbindir}/mysqld-wait-ready
638  %dir %{_libdir}/mysql/plugin  %dir %{_libdir}/mysql/plugin
 %{_libdir}/mysql/plugin/query_cache_info.so  
639  # authentication plugins  # authentication plugins
640  %{_libdir}/mysql/plugin/auth_socket.so  %{_libdir}/mysql/plugin/auth_socket.so
641  %{_libdir}/mysql/plugin/auth_pam.so  %{_libdir}/mysql/plugin/auth_pam.so
# Line 667  fi Line 657  fi
657  %{_libdir}/mysql/plugin/qa_auth_interface.so  %{_libdir}/mysql/plugin/qa_auth_interface.so
658  %{_libdir}/mysql/plugin/qa_auth_server.so  %{_libdir}/mysql/plugin/qa_auth_server.so
659  # example plugins, not usefull at all, removing  # example plugins, not usefull at all, removing
 #%{_libdir}/mysql/plugin/auth_test_plugin.so  
660  #%{_libdir}/mysql/plugin/auth_0x0100.so  #%{_libdir}/mysql/plugin/auth_0x0100.so
661    #%{_libdir}/mysql/plugin/auth_test_plugin.so
662  #%{_libdir}/mysql/plugin/dialog_examples.so  #%{_libdir}/mysql/plugin/dialog_examples.so
663    
664  %files -n mysql-MariaDB  %files -n mysql-MariaDB
# Line 684  fi Line 674  fi
674  %{_libdir}/mysql/plugin/ha_oqgraph.so  %{_libdir}/mysql/plugin/ha_oqgraph.so
675  %{_libdir}/mysql/plugin/ha_sphinx.so  %{_libdir}/mysql/plugin/ha_sphinx.so
676  %{_libdir}/mysql/plugin/handlersocket.so  %{_libdir}/mysql/plugin/handlersocket.so
677    # new optional functionality
678    %{_libdir}/mysql/plugin/query_cache_info.so
679    
680  %files client  %files client
681  %config(noreplace) %{_sysconfdir}/mysqlaccess.conf  %config(noreplace) %{_sysconfdir}/mysqlaccess.conf

Legend:
Removed from v.434194  
changed lines
  Added in v.434195

  ViewVC Help
Powered by ViewVC 1.1.28