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

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

Parent Directory | 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/
  Source0:        %{mirror}/%{name}-%{version}/kvm-tarbake-jaunty-x86/%{name}-%{version}.tar.gz
  Source2:        mysqld.sysconfig
  Source3:        my.cnf
- Source4:        libmysql.version
  Source10:       mysql.tmpfiles.d
  Source11:       mysqld.service
  Source12:       mysqld-prepare-db-dir
-Line 70 
 Source13:      mysqld-wait-ready
+Line 69 
 Source13:      mysqld-wait-ready
  Patch1:         mariadb-5.5-errno.patch
  Patch3:         mariadb-5.5-install-test.patch
  Patch4:         mysql-expired-certs.patch
- Patch8:         mariadb-5.5-dubious-exports.patch
  # mandriva patches
  Patch101:       mariadb-5.5-logrotate.patch
- Patch102:       mariadb-5.5-initscript.patch
  Patch106:       mariadb-5.5-hotcopy.patch
  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch
-Line 368 
 rm -f mysql-test/t/file_contents.test
+Line 365 
 rm -f mysql-test/t/file_contents.test
  # fix distribution name
  sed -i 's/Source distribution/%{_vendor} MariaDB Server/' mysql-test/suite/percona/innodb_sys_index.result
- # upstream has fallen down badly on symbol versioning, do it ourselves
- cp %{SOURCE4} libmysql/libmysql.version
  %build
  %serverbuild
  export CFLAGS="${CFLAGS:-%{optflags}}"
-Line 417 
 export FFLAGS="${FFLAGS:-%{optflags}}"
+Line 411 
 export FFLAGS="${FFLAGS:-%{optflags}}"
      -DWITHOUT_DAEMON_EXAMPLE=1 \
      -DWITH_PLUGIN_PBXT=0 \
      -DFEATURE_SET="community" \
+     -DRPM=1 \
      -DCOMPILATION_COMMENT="%{_vendor} MariaDB Server"
- cp ../libmysql/libmysql.version libmysql/libmysql.version
  %make
  %install
-Line 434 
 export DONT_STRIP=1
+Line 427 
 export DONT_STRIP=1
  %endif
  install -d %{buildroot}%{_sysconfdir}/sysconfig
- install -d %{buildroot}%{_initrddir}
  install -d %{buildroot}%{_var}/log/mysqld
  install -d %{buildroot}/var/lib/mysql/{mysql,test}
-Line 443 
 install -d %{buildroot}/var/lib/mysql/{m
+Line 435 
 install -d %{buildroot}/var/lib/mysql/{m
  # exclude loaddata7 from being converted
  export EXCLUDE_FROM_EOL_CONVERSION="std_data/loaddata7.dat"
- # install init scripts
- install -m0755 build/support-files/mysql.server %{buildroot}%{_initrddir}/mysqld
  # install configuration files
  install -m0644 Mageia/mysqld.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/mysqld
  install -m0644 Mageia/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
-Line 458 
 install -m 0755 %{SOURCE13} %{buildroot}
+Line 447 
 install -m 0755 %{SOURCE13} %{buildroot}
  # bork
  mv %{buildroot}%{_bindir}/mysqlaccess.conf %{buildroot}%{_sysconfdir}/
  chmod 644 %{buildroot}%{_sysconfdir}/mysqlaccess.conf
- mv %{buildroot}%{_prefix}/scripts/mysql_install_db %{buildroot}%{_bindir}/
  mv %{buildroot}%{_datadir}/mysql/aclocal %{buildroot}%{_datadir}/aclocal
  pushd %{buildroot}%{_bindir}
-Line 517 
 rm -f %{buildroot}%{_libdir}/mysql/plugi
+Line 505 
 rm -f %{buildroot}%{_libdir}/mysql/plugi
  # no RHEL4 selinux files for us
  rm -rf %{buildroot}%{_datadir}/mysql/SELinux
+ # no init script for us
+ rm -f %{buildroot}%{_initrddir}/mysql
+ rm -f %{buildroot}%{_initrddir}/mysqld
+ # no split up config yet
+ rm -rf %{buildroot}%{_sysconfdir}/my.cnf.d
  # house cleaning
  rm -rf %{buildroot}%{_datadir}/info
-Line 540 
 rm -f %{buildroot}%{_datadir}/mysql/magi
+Line 533 
 rm -f %{buildroot}%{_datadir}/mysql/magi
  rm -rf %{buildroot}%{_prefix}/data
  rm -rf %{buildroot}%{_prefix}/docs
  rm -rf %{buildroot}%{_prefix}/scripts
- rm -f %{buildroot}%{_prefix}/COPYING
+ rm -rf %{buildroot}%{_datadir}/doc
- rm -f %{buildroot}%{_prefix}/COPYING.LESSER
+ rm -rf %{buildroot}%{_sysconfdir}/init.d/mysql
- rm -f %{buildroot}%{_prefix}/INSTALL-BINARY
+ rm -rf %{buildroot}%{_sysconfdir}/logrotate.d/mysql
- rm -f %{buildroot}%{_prefix}/README
  %multiarch_binaries %{buildroot}%{_bindir}/mysql_config
  %multiarch_includes %{buildroot}%{_includedir}/mysql/my_config.h
-Line 639 
 fi
+Line 631 
 fi
  %files
  %doc README.urpmi
- %{_initrddir}/mysqld
  %{_tmpfilesdir}/mysql.conf
  %{_unitdir}/mysqld.service
  %{_sbindir}/mysqld-prepare-db-dir
  %{_sbindir}/mysqld-wait-ready
  %dir %{_libdir}/mysql/plugin
- %{_libdir}/mysql/plugin/query_cache_info.so
  # authentication plugins
  %{_libdir}/mysql/plugin/auth_socket.so
  %{_libdir}/mysql/plugin/auth_pam.so
-Line 667 
 fi
+Line 657 
 fi
  %{_libdir}/mysql/plugin/qa_auth_interface.so
  %{_libdir}/mysql/plugin/qa_auth_server.so
  # example plugins, not usefull at all, removing
- #%{_libdir}/mysql/plugin/auth_test_plugin.so
  #%{_libdir}/mysql/plugin/auth_0x0100.so
+ #%{_libdir}/mysql/plugin/auth_test_plugin.so
  #%{_libdir}/mysql/plugin/dialog_examples.so
  %files -n mysql-MariaDB
-Line 684 
 fi
+Line 674 
 fi
  %{_libdir}/mysql/plugin/ha_oqgraph.so
  %{_libdir}/mysql/plugin/ha_sphinx.so
  %{_libdir}/mysql/plugin/handlersocket.so
+ # new optional functionality
+ %{_libdir}/mysql/plugin/query_cache_info.so
  %files client
  %config(noreplace) %{_sysconfdir}/mysqlaccess.conf

 Legend:



Removed from v.434194
 


changed lines


 
Added in v.434195
 Legend:



Removed from v.434194
 


changed lines


 
Added in v.434195
-Removed from v.434194
+Added in v.434195

	ViewVC Help
Powered by ViewVC 1.1.30