/[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.5 by unnilennium, Thu Mar 31 12:57:40 2016 UTC Revision 1.14 by unnilennium, Sun Jul 24 15:20:03 2016 UTC
# Line 1  Line 1 
1  # $Id: e-smith-mysql.spec,v 1.4 2016/03/31 11:25:33 unnilennium Exp $  # $Id: e-smith-mysql.spec,v 1.13 2016/07/23 06:24:27 stephdl 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 4  %define release 13
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  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  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
20  BuildArchitectures: noarch  BuildArchitectures: noarch
21  Requires: mariadb-server  Requires: mariadb-server
# Line 21  BuildRequires: e-smith-devtools >= 1.13. Line 26  BuildRequires: e-smith-devtools >= 1.13.
26  AutoReqProv: no  AutoReqProv: no
27    
28  %changelog  %changelog
29    * Sun Jul 24 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
30    - systemd skip redirect [SME: 9688]
31    
32    * Sat Jul 23 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-12.sme
33    - Corrected a typo in e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
34    - [SME: 9671]
35    
36    * Thu Jul 21 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
37    - fix broken link /etc/init.d/supervise/mariadb [SME: 9686]
38    
39    * Mon Jul 18 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-10.sme
40    - Remove Dummy database from backup and restoration [SME: 9671]
41    - Added  e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch
42    
43    * Mon Jul 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
44    - fix forgotten mysqld variables in various scripts [SME: 9438]
45    -  e-smith-mysql-2.6.0-mariadb_forgotten_var.patch
46    
47    * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-7.sme
48    - Use default InnoDB settings [SME: 9439]
49    
50    * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-6.sme
51    - Rename mysqld to mariadb [SME: 9438]
52    
53    * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-5.sme
54    - Remove uneeded scriplets %post and %postun [SME: 9422]
55    
56  * Thu Mar 31 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme  * Thu Mar 31 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
57  - new path for pid file with mariadb [SME: 9407]  - new path for pid file with mariadb [SME: 9407]
58  - my.cnf : Innodb needs to be active for mariadb [SME: 9406]  - my.cnf : Innodb needs to be active for mariadb [SME: 9406]
# Line 725  mysql. Line 757  mysql.
757  %prep  %prep
758  %setup  %setup
759  %patch0 -p1  %patch0 -p1
760    %patch1 -p1
761    %patch2 -p1
762    %patch3 -p1
763    %patch4 -p1
764    %patch5 -p1
765    
766    # mysqld renamed to mariadb [SME: 9438]
767    # TODO: remove on next tarball creation
768    rm -f root/service/mysqld
769    rm -rf root/var/service/mysqld
770    rm -rf root/var/run/
771    rm -rf root/var/log/mysqld
772    rm -f root/etc/rc.d/init.d/supervise/mysqld
773    rm -f root/etc/rc.d/rc7.d/S50mysqld
774    
775    mkdir -p root/var/log/mariadb.run
776    
777  %build  %build
778  perl createlinks  perl createlinks
# Line 734  perl createlinks Line 781  perl createlinks
781  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
782  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
783  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
784      --dir /var/run/mysqld 'attr(0755,mysql,mysql)' \      --file /var/service/mariadb/run 'attr(0755,root,root)' \
785      --file /var/service/mysqld/run 'attr(0755,root,root)' \      --file /var/service/mariadb/control/t 'attr(0750,root,root)' \
786      --file /var/service/mysqld/control/t 'attr(0750,root,root)' \      --file /var/service/mariadb/control/d 'attr(0750,root,root)' \
787      --file /var/service/mysqld/control/d 'attr(0750,root,root)' \      --file /var/service/mariadb/control/i 'attr(0750,root,root)' \
788      --file /var/service/mysqld/control/i 'attr(0750,root,root)' \      --file /var/service/mariadb/control/q 'attr(0750,root,root)' \
789      --file /var/service/mysqld/control/q 'attr(0750,root,root)' \      --file /var/service/mariadb/log/run 'attr(0755,root,root)' \
790      --file /var/service/mysqld/log/run 'attr(0755,root,root)' \      --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \
     --dir '/var/log/mysqld' 'attr(2750,smelog,smelog)' \  
791      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
792      > %{name}-%{version}-filelist      > %{name}-%{version}-filelist
793  echo "%doc COPYING"          >> %{name}-%{version}-filelist  echo "%doc COPYING"          >> %{name}-%{version}-filelist
# Line 750  echo "%doc COPYING"          >> %{name}- Line 796  echo "%doc COPYING"          >> %{name}-
796  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
797    
798  %post  %post
 # mysql.com compatibility  
 [ -e /etc/rc.d/init.d/mysqld ] || ln -s ./mysql /etc/rc.d/init.d/mysqld  
 # We remove this because the template has been renamed  
 /bin/rm -f /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/e-smith/sql/init/10fix_privilege_tables  
   
799    
800  %postun  %postun
 if [ "$1" == 0 ]; then  
   [ -L /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld || :  
 fi  
801    
802  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
803  %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