--- rpms/e-smith-apache/sme10/e-smith-apache.spec 2016/02/07 10:54:50 1.4 +++ rpms/e-smith-apache/sme10/e-smith-apache.spec 2016/03/23 12:58:14 1.5 @@ -1,15 +1,16 @@ -# $Id: e-smith-apache.spec,v 1.1 2016/02/04 18:31:20 vip-ire Exp $ +# $Id: e-smith-apache.spec,v 1.4 2016/02/07 10:54:50 vip-ire Exp $ Summary: e-smith server and gateway - apache module %define name e-smith-apache Name: %{name} %define version 2.6.0 -%define release 1 +%define release 2 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch0: e-smith-apache-2.6.0-httpd24.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base >= 4.15.1 @@ -28,7 +29,37 @@ BuildRequires: e-smith-devtools >= 1.11. %description e-smith server and gateway software - apache module. +%prep +%setup +%patch0 -p1 + +%build +perl createlinks + +%install +rm -rf $RPM_BUILD_ROOT +(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) + +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ + --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ + --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ + > e-smith-%{version}-filelist + +echo "%doc COPYING" >> e-smith-%{version}-filelist + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f e-smith-%{version}-filelist +%defattr(-,root,root) + + %changelog +* Wed Mar 23 2016 Jean-Philipe Pialasse 2.6.0-2.sme +- fix syntax preventing httpd to launch [SME: 9364] +- moved changelog at end of file + * Thu Feb 4 2016 Daniel Berteaud 2.6.0-1.sme - Roll new stream for sme10 @@ -595,26 +626,3 @@ e-smith server and gateway software - ap - [0.1.0-01] - Initial release, split out from e-smith-base [markk 6428] -%prep -%setup - -%build -perl createlinks - -%install -rm -rf $RPM_BUILD_ROOT -(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) - -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \ - --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \ - --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \ - > e-smith-%{version}-filelist - -echo "%doc COPYING" >> e-smith-%{version}-filelist - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f e-smith-%{version}-filelist -%defattr(-,root,root)