/[smeserver]/rpms/e-smith-mysql/sme10/e-smith-mysql.spec

Diff of /rpms/e-smith-mysql/sme10/e-smith-mysql.spec

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

-Revision 1.2 by unnilennium,
Fri Mar 18 11:09:07 2016 UTC
+Revision 1.16 by jpp,
Tue Dec  8 03:26:23 2020 UTC
 Line 1
- # $Id: e-smith-mysql.spec,v 1.1 2016/02/05 22:29:58 stephdl Exp $
+ # $Id: e-smith-mysql.spec,v 1.15 2020/12/08 02:55:37 jpp Exp $
  Summary: e-smith specific mysql configuration and templates.
  %define name e-smith-mysql
  Name: %{name}
  %define version 2.6.0
- %define release 2
+ %define release 14
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
  Group: Networking/Daemons
  Source: %{name}-%{version}.tar.xz
+ Patch0: e-smith-mysql-2.6.0-mariadb1.patch
+ Patch1: e-smith-mysql-2.6.0-mysqld2mariadb.patch
+ Patch2: e-smith-mysql-2.6.0-use_default_innodb_settings.patch
+ Patch3: e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
+ Patch4: e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
+ Patch5: e-smith-mysql-2.6.0.bz9688.skipredirect.patch
+ Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch
+ Patch7: e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArchitectures: noarch
  Requires: mariadb-server
-Line 20 
 BuildRequires: e-smith-devtools >= 1.13.
+Line 29 
 BuildRequires: e-smith-devtools >= 1.13.
  AutoReqProv: no
  %changelog
+ * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-14.sme
+ - e-smith-update event [SME: 11145]
+ - mariadb systemd integration [SME: 11021]
+   move set.password and template
+   create /usr/lib/systemd/system/mariadb.service.d/sme.conf
+   create /sbin/e-smith/systemd/mariadb-initialize + chmod
+   cleanup
+ - mysql.init systemd integration [SME: 11120]
+   create mysql_init.service
+ * Sun Jul 24 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
+ - systemd skip redirect [SME: 9688]
+ * Sat Jul 23 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-12.sme
+ - Corrected a typo in e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
+ - [SME: 9671]
+ * Thu Jul 21 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+ - fix broken link /etc/init.d/supervise/mariadb [SME: 9686]
+ * Mon Jul 18 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-10.sme
+ - Remove Dummy database from backup and restoration [SME: 9671]
+ - Added  e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
+ * Mon Jul 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+ - fix forgotten mysqld variables in various scripts [SME: 9438]
+ -  e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
+ * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-7.sme
+ - Use default InnoDB settings [SME: 9439]
+ * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-6.sme
+ - Rename mysqld to mariadb [SME: 9438]
+ * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-5.sme
+ - Remove uneeded scriplets %post and %postun [SME: 9422]
+ * Thu Mar 31 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
+ - new path for pid file with mariadb [SME: 9407]
+ - my.cnf : Innodb needs to be active for mariadb [SME: 9406]
  * Fri Mar 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
  - fix mysql-server not found [SME: 9345]
  - now using mariadb-server and mariadb
+ - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+   by assuming the date is correct and changing the weekday.
+   Wed Mar 23 2001 --> Wed Mar 21 2001 or Fri Mar 23 2001 or Wed Mar 28 2001 or ....
  * Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
  - Initial release to sme10
-Line 464 
 AutoReqProv: no
+Line 518 
 AutoReqProv: no
  - [1.3.0-12]
  - force mysql.init to print to stderr instead of stout
- * Wed Mar 23 2001 Tony Clayton <tonyc@e-smith.com>
+ * Fri Mar 23 2001 Tony Clayton <tonyc@e-smith.com>
+   Wed Mar 23 2001 --> Wed Mar 21 2001 or Fri Mar 23 2001 or Wed Mar 28 2001 or ....
  - [1.3.0-11]
  - fixed uninitialized value error in conf-mysql-startup
-Line 715 
 mysql.
+Line 770 
 mysql.
  %prep
  %setup
+ %patch0 -p1
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
+ %patch4 -p1
+ %patch5 -p1
+ # mysqld renamed to mariadb [SME: 9438]
+ # TODO: remove on next tarball creation
+ rm -f root/service/mysqld
+ rm -rf root/var/service/mysqld
+ rm -rf root/var/run/
+ rm -rf root/var/log/mysqld
+ rm -f root/etc/rc.d/init.d/supervise/mysqld
+ rm -f root/etc/rc.d/rc7.d/S50mysqld
+ mkdir -p root/var/log/mariadb.run
+ %patch6 -p1
+ # move mariadb to systemd
+ %patch7 -p1
+ rm -rf root/etc/e-smith/templates.metadata/var/service
+ rm -rf root/etc/e-smith/templates/var/service/mariadb
+ rm -rf root/var/service
+ rm -rf root/service
+ rm -rf root/etc/rc.d/init.d/supervise
  %build
  perl createlinks
-Line 723 
 perl createlinks
+Line 803 
 perl createlinks
  rm -rf $RPM_BUILD_ROOT
  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-     --dir /var/run/mysqld 'attr(0755,mysql,mysql)' \
+     --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,root,root)' \
-     --file /var/service/mysqld/run 'attr(0755,root,root)' \
+     --file /var/service/mariadb/run 'attr(0755,root,root)' \
-     --file /var/service/mysqld/control/t 'attr(0750,root,root)' \
+     --file /var/service/mariadb/control/t 'attr(0750,root,root)' \
-     --file /var/service/mysqld/control/d 'attr(0750,root,root)' \
+     --file /var/service/mariadb/control/d 'attr(0750,root,root)' \
-     --file /var/service/mysqld/control/i 'attr(0750,root,root)' \
+     --file /var/service/mariadb/control/i 'attr(0750,root,root)' \
-     --file /var/service/mysqld/control/q 'attr(0750,root,root)' \
+     --file /var/service/mariadb/control/q 'attr(0750,root,root)' \
-     --file /var/service/mysqld/log/run 'attr(0755,root,root)' \
+     --file /var/service/mariadb/log/run 'attr(0755,root,root)' \
-     --dir '/var/log/mysqld' 'attr(2750,smelog,smelog)' \
+     --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \
      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
      > %{name}-%{version}-filelist
  echo "%doc COPYING"          >> %{name}-%{version}-filelist
-Line 738 
 echo "%doc COPYING"          >> %{name}-
+Line 818 
 echo "%doc COPYING"          >> %{name}-
  %clean
  rm -rf $RPM_BUILD_ROOT
- %post
+ %pre
- # mysql.com compatibility
+ if [ $1 -gt 1 ] ; then
- [ -e /etc/rc.d/init.d/mysqld ] || ln -s ./mysql /etc/rc.d/init.d/mysqld
+   if [ -e /var/service/mariadb/run ] ; then
- # We remove this because the template has been renamed
+         /usr/bin/sv d mariadb
- /bin/rm -f /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/sql/init/10fix_privilege_tables
+         /usr/bin/sv d mariadb/log
+   fi
+ fi
+ %post
  %postun
- if [ "$1" == 0 ]; then
-   [ -L /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld || :
- fi
  %files -f %{name}-%{version}-filelist
  %defattr(-,root,root)

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1