/[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.7 by vip-ire, Mon Apr 11 20:32:10 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.6 2016/04/11 19:12:05 vip-ire 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 6
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  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
16  BuildArchitectures: noarch  BuildArchitectures: noarch
17  Requires: mariadb-server  Requires: mariadb-server
# Line 20  BuildRequires: e-smith-devtools >= 1.13. Line 22  BuildRequires: e-smith-devtools >= 1.13.
22  AutoReqProv: no  AutoReqProv: no
23    
24  %changelog  %changelog
25    * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-6.sme
26    - Rename mysqld to mariadb [SME: 9438]
27    
28    * Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-5.sme
29    - Remove uneeded scriplets %post and %postun [SME: 9422]
30    
31    * Thu Mar 31 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
32    - new path for pid file with mariadb [SME: 9407]
33    - my.cnf : Innodb needs to be active for mariadb [SME: 9406]
34    
35  * 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
36  - fix mysql-server not found [SME: 9345]  - fix mysql-server not found [SME: 9345]
37  - now using mariadb-server and mariadb  - now using mariadb-server and mariadb
# Line 719  mysql. Line 731  mysql.
731    
732  %prep  %prep
733  %setup  %setup
734    %patch0 -p1
735    %patch1 -p1
736    
737    # mysqld renamed to mariadb [SME: 9438]
738    # TODO: remove on next tarball creation
739    rm -f root/service/mysqld
740    rm -rf root/var/service/mysqld
741    rm -rf root/var/run/
742    rm -rf root/var/log/mysqld
743    rm -f root/etc/rc.d/init.d/supervise/mysqld
744    rm -f root/etc/rc.d/rc7.d/S50mysqld
745    
746    mkdir -p root/var/log/mariadb.run
747    
748  %build  %build
749  perl createlinks  perl createlinks
# Line 727  perl createlinks Line 752  perl createlinks
752  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
753  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
754  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
755      --dir /var/run/mysqld 'attr(0755,mysql,mysql)' \      --file /var/service/mariadb/run 'attr(0755,root,root)' \
756      --file /var/service/mysqld/run 'attr(0755,root,root)' \      --file /var/service/mariadb/control/t 'attr(0750,root,root)' \
757      --file /var/service/mysqld/control/t 'attr(0750,root,root)' \      --file /var/service/mariadb/control/d 'attr(0750,root,root)' \
758      --file /var/service/mysqld/control/d 'attr(0750,root,root)' \      --file /var/service/mariadb/control/i 'attr(0750,root,root)' \
759      --file /var/service/mysqld/control/i 'attr(0750,root,root)' \      --file /var/service/mariadb/control/q 'attr(0750,root,root)' \
760      --file /var/service/mysqld/control/q 'attr(0750,root,root)' \      --file /var/service/mariadb/log/run 'attr(0755,root,root)' \
761      --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)' \  
762      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \      --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \
763      > %{name}-%{version}-filelist      > %{name}-%{version}-filelist
764  echo "%doc COPYING"          >> %{name}-%{version}-filelist  echo "%doc COPYING"          >> %{name}-%{version}-filelist
# Line 743  echo "%doc COPYING"          >> %{name}- Line 767  echo "%doc COPYING"          >> %{name}-
767  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
768    
769  %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  
   
770    
771  %postun  %postun
 if [ "$1" == 0 ]; then  
   [ -L /etc/rc.d/init.d/mysqld ] && rm /etc/rc.d/init.d/mysqld || :  
 fi  
772    
773  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
774  %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