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

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

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

Revision 1.1 by stephdl, Fri Feb 5 22:29:58 2016 UTC Revision 1.21 by jpp, Sun Dec 13 22:09:39 2020 UTC
# Line 1  Line 1 
1  # $Id: e-smith-mysql.spec,v 1.10 2014/04/26 18:03:21 wellsi Exp $  # $Id: e-smith-mysql.spec,v 1.20 2020/12/10 04:25:50 jpp Exp $
2    
3  Summary: e-smith specific mysql configuration and templates.  Summary: e-smith specific mysql configuration and templates.
4  %define name e-smith-mysql  %define name e-smith-mysql
5  Name: %{name}  Name: %{name}
6  %define version 2.6.0  %define version 2.6.0
7  %define release 1  %define release 17
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
11  Group: Networking/Daemons  Group: Networking/Daemons
12  Source: %{name}-%{version}.tar.xz  Source: %{name}-%{version}.tar.xz
13    Patch0: e-smith-mysql-2.6.0-mariadb1.patch
14    Patch1: e-smith-mysql-2.6.0-mysqld2mariadb.patch
15    Patch2: e-smith-mysql-2.6.0-use_default_innodb_settings.patch
16    Patch3: e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
17    Patch4: e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
18    Patch5: e-smith-mysql-2.6.0.bz9688.skipredirect.patch
19    Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch
20    Patch7: e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch
21    Patch8: e-smith-mysql-2.6.0-bz11120-mysql.init2systemd.patch
22    
23  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
24  BuildArchitectures: noarch  BuildArchitectures: noarch
25  Requires: mysql-server  Requires: mariadb-server
26  Requires: mysql  Requires: mariadb
27  Requires: e-smith-base  Requires: e-smith-base
28  Requires: e-smith-lib >= 1.15.1-19  Requires: e-smith-lib >= 1.15.1-19
29  BuildRequires: e-smith-devtools >= 1.13.1-03  BuildRequires: e-smith-devtools >= 1.13.1-03
30  AutoReqProv: no  AutoReqProv: no
31    
32  %changelog  %changelog
33    * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
34    - expand 10mysql_upgrade and restart mysql.init on e-smith-mysql-update [SME: 11120]
35      this to make sure mariadb upgrade fully and prevent residual 10mysql_upgrade stay in the way
36    
37    * Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
38    - fix issue with 10mysql_upgrade crashing mariadb [SME: 11120]
39      also removed noise from spec file
40    
41    * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
42    - e-smith-update event [SME: 11145]
43    - mariadb systemd integration [SME: 11021]
44      move set.password and template
45      create /usr/lib/systemd/system/mariadb.service.d/sme.conf
46      create /sbin/e-smith/systemd/mariadb-initialize + chmod
47      cleanup and remove old /var/service/mariadb
48    - mysql.init systemd integration [SME: 11120]
49      create mysql_init.service
50    
51    
52    * Sun Jul 24 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
53    - systemd skip redirect [SME: 9688]
54    
55    * Sat Jul 23 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-12.sme
56    - Corrected a typo in e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
57    - [SME: 9671]
58    
59    * Thu Jul 21 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
60    - fix broken link /etc/init.d/supervise/mariadb [SME: 9686]
61    
62    * Mon Jul 18 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-10.sme
63    - Remove Dummy database from backup and restoration [SME: 9671]
64    - Added  e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
65    
66    * Mon Jul 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
67    - fix forgotten mysqld variables in various scripts [SME: 9438]
68    -  e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
69    
70    * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-7.sme
71    - Use default InnoDB settings [SME: 9439]
72    
73    * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-6.sme
74    - Rename mysqld to mariadb [SME: 9438]
75    
76    * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-5.sme
77    - Remove uneeded scriplets %post and %postun [SME: 9422]
78    
79    * Thu Mar 31 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
80    - new path for pid file with mariadb [SME: 9407]
81    - my.cnf : Innodb needs to be active for mariadb [SME: 9406]
82    
83    * Fri Mar 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
84    - fix mysql-server not found [SME: 9345]
85    - now using mariadb-server and mariadb
86    - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
87      by assuming the date is correct and changing the weekday.
88      Wed Mar 23 2001 --> Wed Mar 21 2001 or Fri Mar 23 2001 or Wed Mar 28 2001 or ....
89    
90  * Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme  * Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
91  - Initial release to sme10  - Initial release to sme10
92    
# Line 460  AutoReqProv: no Line 527  AutoReqProv: no
527  - [1.3.0-12]  - [1.3.0-12]
528  - force mysql.init to print to stderr instead of stout  - force mysql.init to print to stderr instead of stout
529    
530  * Wed Mar 23 2001 Tony Clayton <tonyc@e-smith.com>  * Fri Mar 23 2001 Tony Clayton <tonyc@e-smith.com>
531      Wed Mar 23 2001 --> Wed Mar 21 2001 or Fri Mar 23 2001 or Wed Mar 28 2001 or ....
532  - [1.3.0-11]  - [1.3.0-11]
533  - fixed uninitialized value error in conf-mysql-startup  - fixed uninitialized value error in conf-mysql-startup
534    
# Line 711  mysql. Line 779  mysql.
779    
780  %prep  %prep
781  %setup  %setup
782    %patch0 -p1
783    %patch1 -p1
784    %patch2 -p1
785    %patch3 -p1
786    %patch4 -p1
787    %patch5 -p1
788    # mysqld renamed to mariadb [SME: 9438]
789    # TODO: remove on next tarball creation
790    rm -f root/service/mysqld
791    rm -rf root/var/service/mysqld
792    rm -rf root/var/run/
793    rm -rf root/var/log/mysqld
794    rm -f root/etc/rc.d/init.d/supervise/mysqld
795    rm -f root/etc/rc.d/rc7.d/S50mysqld
796    
797    mkdir -p root/var/log/mariadb.run
798    %patch6 -p1
799    # move mariadb to systemd
800    %patch7 -p1
801    rm -rf root/etc/e-smith/templates.metadata/var/service
802    rm -rf root/etc/e-smith/templates/var/service/mariadb
803    rm -rf root/var/service
804    rm -rf root/service
805    rm -rf root/etc/rc.d/init.d/supervise
806    rm -rf root/var/log
807    
808    # move mysql.init
809    %patch8 -p1
810    rm -rf root/etc/rc.d/rc7.d
811    
812  %build  %build
813  perl createlinks  perl createlinks
# Line 719  perl createlinks Line 816  perl createlinks
816  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
817  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
818  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
819      --dir /var/run/mysqld 'attr(0755,mysql,mysql)' \      --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,root,root)' \
820      --file /var/service/mysqld/run 'attr(0755,root,root)' \      --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \
     --file /var/service/mysqld/control/t 'attr(0750,root,root)' \  
     --file /var/service/mysqld/control/d 'attr(0750,root,root)' \  
     --file /var/service/mysqld/control/i 'attr(0750,root,root)' \  
     --file /var/service/mysqld/control/q 'attr(0750,root,root)' \  
     --file /var/service/mysqld/log/run 'attr(0755,root,root)' \  
     --dir '/var/log/mysqld' 'attr(2750,smelog,smelog)' \  
821      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
822      > %{name}-%{version}-filelist      > %{name}-%{version}-filelist
823  echo "%doc COPYING"          >> %{name}-%{version}-filelist  echo "%doc COPYING"          >> %{name}-%{version}-filelist
# Line 734  echo "%doc COPYING"          >> %{name}- Line 825  echo "%doc COPYING"          >> %{name}-
825  %clean  %clean
826  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
827    
828  %post  %pre
829  # mysql.com compatibility  if [ $1 -gt 1 ] ; then
830  [ -e /etc/rc.d/init.d/mysqld ] || ln -s ./mysql /etc/rc.d/init.d/mysqld    if [ -e /var/service/mariadb/run ] ; then
831  # We remove this because the template has been renamed          /usr/bin/sv d mariadb
832  /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
833      fi
834    fi
835    
836    %post
837    
838  %postun  %postun
 if [ "$1" == 0 ]; then  
   [ -L /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld || :  
 fi  
839    
840  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
841  %defattr(-,root,root)  %defattr(-,root,root)

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed