--- rpms/smeserver-centos2sme/contribs9/smeserver-centos2sme.spec 2018/03/10 04:30:17 1.3 +++ rpms/smeserver-centos2sme/contribs9/smeserver-centos2sme.spec 2018/03/10 17:26:09 1.4 @@ -1,4 +1,4 @@ -# $Id: smeserver-centos2sme.spec,v 1.2 2018/03/09 20:23:58 jpp Exp $ +# $Id: smeserver-centos2sme.spec,v 1.3 2018/03/10 04:30:17 jpp Exp $ # Authority: unnilennium # Name: Jean-Philippe Pialasse @@ -6,13 +6,14 @@ Summary: smeserver-centos2sme %define name smeserver-centos2sme %define version 6.9.1 # version number CentosMajorVersion.SMEmajorVersion.RPMversion -%define release 3 +%define release 4 Name: %{name} Version: %{version} Release: %{release}%{?dist} License: GPL Group: Applications/System Source: %{name}-%{version}.tgz +Patch0: smeserver-centos2sme-6.9.1-bz10535-fix-path.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch BuildRequires: e-smith-devtools >= 1.13.1-03 @@ -25,6 +26,7 @@ Just run /usr/bin/centos2sme ; answer th Do not use on a machine with user data present or with extra packages already installed. %prep %setup +%patch0 -p1 %build # /usr/bin/perl createlinks @@ -33,8 +35,10 @@ Do not use on a machine with user data p /bin/rm -rf $RPM_BUILD_ROOT (cd root ; /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 \ + --file /usr/bin/centos2sme '%attr(0755,root,root)' \ + > %{name}-%{version}-filelist +cat %{name}-%{version}-filelist %files -f %{name}-%{version}-filelist %defattr(-,root,root,-) @@ -45,6 +49,13 @@ rm -rf $RPM_BUILD_ROOT touch /etc/hosts.deny_ssh %changelog +* Sat Mar 10 2018 Jean-Philipe Pialasse 6.9.1-4.sme +- fix execution permission on /usr/bin/centos2sme [SME: 10535] +- added warning at the begining of script to check for working network interface +- added warning at end of script to add a SSH key before the reboot +- added full path to signal-event in the last messages +- set path after first packages installation. + * Fri Mar 09 2018 Jean-Philipe Pialasse 6.9.1-3.sme - fix bad dependencies to smeserver release and formagick [SME: 10535] - added requirement for centos-release between 6 and 7.