--- rpms/smeserver-smf/contribs9/smeserver-smf.spec	2017/06/14 20:40:28	1.1
+++ rpms/smeserver-smf/contribs9/smeserver-smf.spec	2017/08/18 16:25:49	1.2
@@ -1,11 +1,10 @@
-# $Id: smeserver-smf.spec,v 1.1 2013/03/03 22:11:18 unnilennium Exp $
+# $Id: smeserver-smf.spec,v 1.1 2017/06/14 20:40:28 unnilennium Exp $
 # Authority: cool34000
 # Name: Sylvain Gomez
 
 %define name smeserver-smf
-%define version 1.1.4
-%define release 1
-%define rpmver  4.0.4
+%define version 2.0.14
+%define release 2
 
 Summary:            SMF is a php web-based forum
 Name:               %{name}
@@ -14,19 +13,24 @@ Release:            %{release}%{?dist}
 License:          GPL
 Group:              Web/Application
 Source:             %{name}-%{version}.tar.gz
+Source1:	    smf_2-0-14_upgrade.tar.gz
 URL:                http://www.simplemachines.org/
 BuildRoot:          /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires:      e-smith-devtools
-Requires:           e-smith-base, e-smith-release >= 7
+Requires:           e-smith-base, e-smith-release >= 9
+Requires:           smeserver-php-scl
 
 %description
-This RPM is an unofficial addon for the SME Server 7.x.
+This RPM is an unofficial addon for the SME Server 9.x.
 Simple Machines Forum — SMF in short — is a free, professional grade software
 package that allows you to set up your own online community within minutes.
 http://yourdomain.com/forum
 
 %changelog
+* Wed Jun 14 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.0.14-2.sme
+- update to 2.0-14 for SME9  [SME: 8919]
+
 * Thu Oct 11 2007 Sylvain Gomez <sylvaingomez@free.fr>
 - 1.1.4-1
   Original version
@@ -35,20 +39,34 @@ http://yourdomain.com/forum
 rm -rf $RPM_BUILD_ROOT
 
 %setup
+#mkdir -p $RPM_BUILD_ROOT/opt/SMF
+#tar -xzf %{SOURCE1} --directory $RPM_BUILD_ROOT/opt/SMF
 
 %build
 
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/opt/SMF
+tar -xzf %{SOURCE1} --directory $RPM_BUILD_ROOT/opt/SMF
 (/usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
 /bin/rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+|sed  -e 's/(0755,root,root) \/opt\/SMF\//(0755,root,www) \/opt\/SMF\//gi'\
+|sed  -e 's|/opt/SMF/Packages/installed.list|%attr(0755,www,www) /opt/SMF/Packages/installed.list|gi' \
+|sed  -e 's|/opt/SMF/agreement.txt|%attr(0755,www,www) /opt/SMF/agreement.txt|gi' \
+|sed  -e 's|%attr(0755,root,www) /opt/SMF/attachments$|%attr(0755,www,www) /opt/SMF/attachments|gi' \
+|sed  -e 's|%attr(0755,root,www) /opt/SMF/avatars$|%attr(0755,www,www) /opt/SMF/avatars|gi' \
+|sed  -e 's|%attr(0755,root,www) /opt/SMF/cache|%attr(0755,www,www) /opt/SMF/cache|gi' \
+|sed  -e 's|%attr(0755,root,www) /opt/SMF/Packages$|%attr(0755,www,www) /opt/SMF/Packages|gi' \
+|sed  -e 's|%attr(0755,root,www) /opt/SMF/Smileys$|%attr(0755,www,www) /opt/SMF/Smileys|gi' \
+|sed  -e 's|%attr(0755,root,www) /opt/SMF/Themes$|%attr(0755,www,www) /opt/SMF/Themes|gi' \
+ > %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist
 
 %defattr(-,root,root)
 
-%clean 
+%clean  
 rm -rf $RPM_BUILD_ROOT
 
 %pre
@@ -62,10 +80,10 @@ echo " "
 SMFPASS=$(/sbin/e-smith/db configuration getprop SMF DbPassword)
 DOMAIN=$(/sbin/e-smith/db configuration get DomainName)
 
-echo "Decompressing files..."
-cd /opt
-tar xfz SMF.tar.gz
-rm SMF.tar.gz
+#echo "Decompressing files..."
+#cd /opt
+#tar xfz SMF.tar.gz
+#rm SMF.tar.gz
 
 echo "Creating MySQL user and DataBase..."
 mysqladmin -u root create smf
@@ -83,11 +101,11 @@ rm -f /opt/SMF_1.sql
 sed -e "s/yourdomain.com/$DOMAIN/" /opt/SMF/Settings.php >/opt/SMF/Settings.php.new
 sed 's.smfpassword.'$SMFPASS'.g' /opt/SMF/Settings.php.new >/opt/SMF/Settings.php
 case "$LANG" in
-	de_DE) sed -e "s/english/german-utf8/"  /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
-	es_ES) sed -e "s/english/spanish-utf8/" /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
-	fr_FR) sed -e "s/english/french-utf8/"  /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
-	it_IT) sed -e "s/english/italian-utf8/" /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
-	sv_FI) sed -e "s/english/swedish-utf8/" /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
+	de_DE.UTF-8) sed -e "s/english/german-utf8/"  /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
+	es_ES.UTF-8) sed -e "s/english/spanish-utf8/" /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
+	fr_FR.UTF-8) sed -e "s/english/french-utf8/"  /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
+	it_IT.UTF-8) sed -e "s/english/italian-utf8/" /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
+	sv_FI.UTF-8) sed -e "s/english/swedish-utf8/" /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
 	    *) sed -e "s/english/english/"      /opt/SMF/Settings.php >/opt/SMF/Settings.php.new ;;
 esac
 mv -f /opt/SMF/Settings.php.new /opt/SMF/Settings.php
@@ -98,11 +116,11 @@ chmod 664 /opt/SMF/Settings.php
 sed -e "s/yourdomain.com/$DOMAIN/" /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new
 sed 's.smfpassword.'$SMFPASS'.g' /opt/SMF/Settings_bak.php.new >/opt/SMF/Settings_bak.php
 case "$LANG" in
-	de_DE) sed -e "s/english/german-utf8/"  /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
-	es_ES) sed -e "s/english/spanish-utf8/" /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
-	fr_FR) sed -e "s/english/french-utf8/"  /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
-	it_IT) sed -e "s/english/italian-utf8/" /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
-	sv_FI) sed -e "s/english/swedish-utf8/" /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
+	de_DE.UTF-8) sed -e "s/english/german-utf8/"  /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
+	es_ES.UTF-8) sed -e "s/english/spanish-utf8/" /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
+	fr_FR.UTF-8) sed -e "s/english/french-utf8/"  /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
+	it_IT.UTF-8) sed -e "s/english/italian-utf8/" /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
+	sv_FI.UTF-8) sed -e "s/english/swedish-utf8/" /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
 	    *) sed -e "s/english/english/"      /opt/SMF/Settings_bak.php >/opt/SMF/Settings_bak.php.new ;;
 esac
 mv -f /opt/SMF/Settings_bak.php.new /opt/SMF/Settings_bak.php
@@ -114,11 +132,11 @@ echo "Applying modifications to httpd...
 /etc/rc7.d/S86httpd-e-smith sigusr1
 
 case "$LANG" in
-	de_DE) lang=German ;;
-	es_ES) lang=Spanish ;;
-	fr_FR) lang=French ;;
-	it_IT) lang=Italian ;;
-	sv_FI) lang=Swedish ;;
+	de_DE.UTF-8) lang=German ;;
+	es_ES.UTF-8) lang=Spanish ;;
+	fr_FR.UTF-8) lang=French ;;
+	it_IT.UTF-8) lang=Italian ;;
+	sv_FI.UTF-8) lang=Swedish ;;
 	    *) lang=English ;;
 esac
 echo " "