/[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 259273 by fwang, Sun Jun 10 06:02:07 2012 UTC revision 279279 by alien, Mon Aug 6 11:46:36 2012 UTC
# Line 31  Line 31 
31  %define build_test 1  %define build_test 1
32  %endif  %endif
33    
   
34  %define major 18  %define major 18
35  %define libmysqlembedded_major 0  %define libmysqlembedded_major 0
36  %define libmysqlembedded_minor 0.1  %define libmysqlembedded_minor 0.1
# Line 53  Line 52 
52  %define muser   mysql  %define muser   mysql
53  Summary:        A very fast and reliable SQL database engine  Summary:        A very fast and reliable SQL database engine
54  Name:           mariadb  Name:           mariadb
55  Version:        5.5.24  Version:        5.5.25
56  Release:        %mkrel 1  Release:        %mkrel 1
57  Group:          Databases  Group:          Databases
58  License:        GPLv2 with exceptions  License:        GPLv2 with exceptions
# Line 83  Patch103:      mariadb-5.5-mysql_upgrade-exit Line 82  Patch103:      mariadb-5.5-mysql_upgrade-exit
82  Patch106:       mariadb-5.5-hotcopy.patch  Patch106:       mariadb-5.5-hotcopy.patch
83  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch
84    
85    # mageia patches (from upstream)
86    Patch120:       mariadb-5.5.25-forgotten-files.patch
87    Patch121:       mariadb-5.5-fix-merge-with-gis-index.patch
88    Patch122:       mariadb-5.5.25-fix-OS-report-feedback.patch
89    
90  Requires(post):  rpm-helper >= 0.24.8-1  Requires(post):  rpm-helper >= 0.24.8-1
91  Requires(preun): rpm-helper >= 0.24.8-1  Requires(preun): rpm-helper >= 0.24.8-1
92  Requires(post): %{name}-common%{_isa} = %{version}-%{release}  Requires(post): %{name}-common%{_isa} = %{version}-%{release}
# Line 447  install -m 755 %{SOURCE12} %{buildroot}% Line 451  install -m 755 %{SOURCE12} %{buildroot}%
451  install -m 755 %{SOURCE13} %{buildroot}%{_sbindir}/mysqld-wait-ready  install -m 755 %{SOURCE13} %{buildroot}%{_sbindir}/mysqld-wait-ready
452    
453  # bork  # bork
454  install -m 0644 scripts/mysqlaccess.conf %{buildroot}%{_sysconfdir}/  mv %{buildroot}%{_bindir}/mysqlaccess.conf %{buildroot}%{_sysconfdir}/
455    chmod 644 %{buildroot}%{_sysconfdir}/mysqlaccess.conf
456  mv %{buildroot}%{_prefix}/scripts/mysql_install_db %{buildroot}%{_bindir}/  mv %{buildroot}%{_prefix}/scripts/mysql_install_db %{buildroot}%{_bindir}/
457  mv %{buildroot}%{_datadir}/mysql/aclocal %{buildroot}%{_datadir}/aclocal  mv %{buildroot}%{_datadir}/mysql/aclocal %{buildroot}%{_datadir}/aclocal
458    
# Line 504  rm -f %{buildroot}%{_libdir}/mysql/plugi Line 509  rm -f %{buildroot}%{_libdir}/mysql/plugi
509  rm -f %{buildroot}%{_libdir}/mysql/plugin/auth_test_plugin.so  rm -f %{buildroot}%{_libdir}/mysql/plugin/auth_test_plugin.so
510  rm -f %{buildroot}%{_libdir}/mysql/plugin/dialog_examples.so  rm -f %{buildroot}%{_libdir}/mysql/plugin/dialog_examples.so
511    
512    # no RHEL4 selinux files for us
513    rm -rf %{buildroot}%{_datadir}/mysql/SELinux
514    
515  # house cleaning  # house cleaning
516  rm -rf %{buildroot}%{_datadir}/info  rm -rf %{buildroot}%{_datadir}/info
517  rm -f %{buildroot}%{_bindir}/client_test  rm -f %{buildroot}%{_bindir}/client_test
# Line 521  rm -f %{buildroot}%{_datadir}/mysql/bina Line 529  rm -f %{buildroot}%{_datadir}/mysql/bina
529  rm -f %{buildroot}%{_mandir}/man1/make_win_bin_dist.1*  rm -f %{buildroot}%{_mandir}/man1/make_win_bin_dist.1*
530  rm -f %{buildroot}%{_mandir}/man1/make_win_src_distribution.1*  rm -f %{buildroot}%{_mandir}/man1/make_win_src_distribution.1*
531  rm -f %{buildroot}%{_datadir}/mysql/magic  rm -f %{buildroot}%{_datadir}/mysql/magic
 rm -f %{buildroot}%{_datadir}/mysql/SELinux/RHEL4/*  
532    
533  # no idea how to fix this  # no idea how to fix this
534  rm -rf %{buildroot}%{_prefix}/data  rm -rf %{buildroot}%{_prefix}/data
# Line 650  fi Line 657  fi
657  # upstream describes this as "junk"  # upstream describes this as "junk"
658  %{_libdir}/mysql/plugin/adt_null.so  %{_libdir}/mysql/plugin/adt_null.so
659  %{_libdir}/mysql/plugin/mypluglib.so  %{_libdir}/mysql/plugin/mypluglib.so
 # nosql plugin  
 %{_libdir}/mysql/plugin/handlersocket.so  
660  %{_libdir}/mysql/plugin/qa_auth_client.so  %{_libdir}/mysql/plugin/qa_auth_client.so
661  %{_libdir}/mysql/plugin/qa_auth_interface.so  %{_libdir}/mysql/plugin/qa_auth_interface.so
662  %{_libdir}/mysql/plugin/qa_auth_server.so  %{_libdir}/mysql/plugin/qa_auth_server.so
# Line 671  fi Line 676  fi
676  %files extra  %files extra
677  %{_libdir}/mysql/plugin/ha_oqgraph.so  %{_libdir}/mysql/plugin/ha_oqgraph.so
678  %{_libdir}/mysql/plugin/ha_sphinx.so  %{_libdir}/mysql/plugin/ha_sphinx.so
679    %{_libdir}/mysql/plugin/handlersocket.so
680    
681  %files client  %files client
682  %config(noreplace) %{_sysconfdir}/mysqlaccess.conf  %config(noreplace) %{_sysconfdir}/mysqlaccess.conf
# Line 756  fi Line 762  fi
762  %{_bindir}/mysql_tzinfo_to_sql  %{_bindir}/mysql_tzinfo_to_sql
763  %{_bindir}/mysql_upgrade  %{_bindir}/mysql_upgrade
764  %{_bindir}/mysql_zap  %{_bindir}/mysql_zap
765    %{_bindir}/mytop
766  %{_bindir}/perror  %{_bindir}/perror
767  %{_bindir}/replace  %{_bindir}/replace
768  %{_bindir}/resolveip  %{_bindir}/resolveip
# Line 798  fi Line 805  fi
805  %{_mandir}/man1/myisamlog.1*  %{_mandir}/man1/myisamlog.1*
806  %{_mandir}/man1/myisampack.1*  %{_mandir}/man1/myisampack.1*
807  %{_mandir}/man1/my_print_defaults.1*  %{_mandir}/man1/my_print_defaults.1*
808    %{_mandir}/man1/mysqlbug.1*
809  %{_mandir}/man1/mysql_convert_table_format.1*  %{_mandir}/man1/mysql_convert_table_format.1*
810  %{_mandir}/man1/mysqld_multi.1*  %{_mandir}/man1/mysqld_multi.1*
811  %{_mandir}/man1/mysqld_safe.1*  %{_mandir}/man1/mysqld_safe.1*
# Line 831  fi Line 839  fi
839  %{_libdir}/libmysqlclient.so  %{_libdir}/libmysqlclient.so
840  %dir %{_includedir}/mysql  %dir %{_includedir}/mysql
841  %dir %{_includedir}/mysql/psi  %dir %{_includedir}/mysql/psi
 %dir %{_includedir}/mysql/private  
842  %{_includedir}/mysql/*.h  %{_includedir}/mysql/*.h
843  %{_includedir}/mysql/private/*.h  %{_includedir}/mysql/private/*.h
844    %{_includedir}/mysql/private/atomic/*.h
845  %{_includedir}/mysql/psi/*.h  %{_includedir}/mysql/psi/*.h
846  %multiarch %{multiarch_includedir}/mysql/my_config.h  %multiarch %{multiarch_includedir}/mysql/my_config.h
847    %{_mandir}/man1/comp_err.1*
848  %{_mandir}/man1/mysql_config.1*  %{_mandir}/man1/mysql_config.1*
849  %{_datadir}/aclocal/mysql.m4  %{_datadir}/aclocal/mysql.m4
850  # mysqlservices library is static, because it doesn't contain any code  # mysqlservices library is static, because it doesn't contain any code
Legend:
Removed from v.259273  
changed lines
  Added in v.279279
  ViewVC Help
Powered by ViewVC 1.1.30