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