--- rpms/smeserver-mock/sme10/smeserver-mock.spec 2022/06/30 20:27:39 1.19 +++ rpms/smeserver-mock/sme10/smeserver-mock.spec 2023/04/30 06:19:47 1.24 @@ -1,10 +1,10 @@ -# $Id: smeserver-mock.spec,v 1.18 2022/06/30 20:23:51 jpp Exp $ - +# $Id: smeserver-mock.spec,v 1.23 2023/04/14 02:57:42 jpp Exp $ +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') Summary: smeserver-mock tools for building RPMs %define name smeserver-mock Name: %{name} %define version 1.0 -%define release 14 +%define release 19 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -21,6 +21,9 @@ Patch7: smeserver-mock-1.0-sme11005-mojo Patch8: smeserver-mock-1.0-sme11203-spamassassin.patch Patch9: smeserver-mock-1.0-sme11005-mojo-jwt-2.patch Patch10: smeserver-mock-1.0-20220630.patch +Patch11: smeserver-mock-1.0-change-log.patch +Patch12: smeserver-mock-1.0-20230412.patch +Patch13: smeserver-mock-1.0-bg12350-cvm.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -36,7 +39,23 @@ Buildrequires: e-smith-devtools AutoReqProv: no %changelog -* Thu Jun 30 2022 Jean-Philippe Pialasse 1.0-14.sme +* Sun Apr 30 2023 TerryFage 1.0-19.sme +- add package to mock*.cfg facilitate cvm build [SME: 12350] +- attribute solution to Trevor batley + +* Thu Apr 13 2023 Jean-Philippe Pialasse 1.0-18.sme +- fixpost scriptled not working [SME: 12349] +- add smeos and smeupdates in mock file + +* Wed Apr 12 2023 Jean-Philippe Pialasse 1.0-17.sme +- fix change-log [SME: 12340] +- update smeserver 10 base mockfile +- perl.prov workaround in mock file + +* Fri Nov 18 2022 Jean-Philippe Pialasse 1.0-16.sme +- fix change-log not handling tab for version or release + +* Thu Jun 30 2022 Jean-Philippe Pialasse 1.0-15.sme - update sme10 mock files [SME: 12089] - remove python scl dependencies blocks a lot from using the rpm almost never needed [SME: 12090] @@ -110,6 +129,9 @@ Few tools are also provided to help you %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build @@ -124,11 +146,14 @@ rm -rf $RPM_BUILD_ROOT --file /usr/bin/createBuildDir '%attr(0755,root,root)' \ --file /usr/bin/prepa '%attr(0755,root,root)' \ --file /usr/bin/tagbuild '%attr(0755,root,root)' \ + --file /etc/mock/perl.prov '%attr(0755,root,root)' \ --ignoredir /usr/lib/python3.6/site-packages/mockbuild/plugins \ --ignoredir /usr/lib/python3.6/site-packages/mockbuild \ --ignoredir /usr/lib/python3.6/site-packages \ --ignoredir /usr/lib/python3.6 \ - | grep -v /etc/mock/ \ + --ignoredir /etc/mock \ + | grep -v copy.pyc \ + | grep -v copy.pyo \ > %{name}-%{version}-filelist %clean @@ -136,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT %pre %preun -%post +%post -p /bin/bash # updates sme site defaults main=/etc/mock/site-defaults.cfg