--- rpms/smeserver-mock/sme10/smeserver-mock.spec 2020/09/04 21:23:42 1.15 +++ rpms/smeserver-mock/sme10/smeserver-mock.spec 2023/06/05 03:08:02 1.26 @@ -1,10 +1,10 @@ -# $Id: smeserver-mock.spec,v 1.14 2020/09/04 21:21:09 michel Exp $ - +# $Id: smeserver-mock.spec,v 1.25 2023/05/04 05:54:26 terryfage 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 11 +%define release 21 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -18,6 +18,14 @@ Patch4: smeserver-mock-1.0-sme10946-mock Patch5: smeserver-mock-1.0-sme10924-bins.patch Patch6: smeserver-mock-1.0-sme10993-kmodtool.patch Patch7: smeserver-mock-1.0-sme11005-mojo-jwt.patch +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 +Patch14: smeserver-mock-1.0-add-pkgs-bz12350.patch +Patch15: smeserver-mock-1.0-extra-pkgs-bz12350.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -28,11 +36,50 @@ Requires: make rpm-build rpm-sign wget Requires: cmake automake libtool Buildrequires: e-smith-devtools # needed for scl -Requires: scl-utils scl-utils-build centos-release-scl centos-release-scl-rh -Requires: python27-build +#Requires: scl-utils scl-utils-build centos-release-scl centos-release-scl-rh +#Requires: python27-build AutoReqProv: no %changelog +* Mon Jun 05 2023 TerryFage 1.0-21.sme +- add to mock*.cfg facilitate build with external packages [SME: 12350] +- attribute solutions Trevor Batley, Terry Fage + +* Thu May 04 2023 TerryFage 1.0-20.sme +- add to mock*.cfg facilitate build with external packages [SME: 12350] +- attribute solutions Trevor Batley, Terry Fage + +* 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] +- cleaning remove sme8 and sme9 mock files +- added workaround to perl.prov not working [SME: 11958] + added mock plugin copy.py and an updated perl.prov +- update embded bins + +* Mon Dec 27 2021 Michel Begue 1.0-13.sme +- fix build deps for Mojo::JWT [SME: 11005] + +* Thu Nov 26 2020 Jean-Philipe Pialasse 1.0-12.sme +- fix build deps for spamassassin [SME: 11203] + * Fri Sep 04 2020 Michel Begue 1.0-11.sme - update dependencies to build Mojo::JWT package [SME: 11005] @@ -89,6 +136,14 @@ Few tools are also provided to help you %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 %build @@ -103,7 +158,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)' \ - | grep -v /etc/mock/ \ + --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 \ + --ignoredir /etc/mock \ + | grep -v copy.pyc \ + | grep -v copy.pyo \ > %{name}-%{version}-filelist %clean @@ -111,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT %pre %preun -%post +%post -p /bin/bash # updates sme site defaults main=/etc/mock/site-defaults.cfg