diff --git a/.gitignore b/.gitignore index dfcf3a3..1d5ba8c 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ mock-1.1.4.tar.gz /mock-1.1.34.tar.gz /mock-1.1.35.tar.gz /mock-1.1.36.tar.gz +/mock-1.1.37.tar.xz diff --git a/mock.spec b/mock.spec index ce99628..ead2350 100644 --- a/mock.spec +++ b/mock.spec @@ -1,7 +1,7 @@ # next four lines substituted by autoconf %define major 1 %define minor 1 -%define sub 36 +%define sub 37 %define extralevel %{nil} %define release_name mock %define release_version %{major}.%{minor}.%{sub}%{extralevel} @@ -17,7 +17,7 @@ Version: %{release_version} Release: 1%{?dist} License: GPLv2+ Group: Development/Tools -Source: https://git.fedorahosted.org/cgit/mock.git/snapshot/%{name}-%{version}.tar.gz +Source: https://git.fedorahosted.org/cgit/mock.git/snapshot/%{name}-%{version}.tar.xz URL: http://fedoraproject.org/wiki/Projects/Mock BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,6 +26,9 @@ Requires: createrepo Requires(pre): shadow-utils Requires(post): coreutils BuildRequires: python-devel, autoconf, automake +%if 0%{?fedora} || 0%{?rhel} > 6 +BuildRequires: bash-completion +%endif %if 0%{?el5} Requires: python-hashlib %endif @@ -67,8 +70,6 @@ ln -s fedora-rawhide-i386.cfg fedora-devel-i386.cfg ln -s fedora-rawhide-x86_64.cfg fedora-devel-x86_64.cfg ln -s fedora-rawhide-ppc.cfg fedora-devel-ppc.cfg ln -s fedora-rawhide-ppc64.cfg fedora-devel-ppc64.cfg -ln -s fedora-rawhide-s390.cfg fedora-devel-s390.cfg -ln -s fedora-rawhide-s390x.cfg fedora-devel-s390x.cfg popd echo "%defattr(0644, root, mock)" > %{name}.cfgs find $RPM_BUILD_ROOT%{_sysconfdir}/mock -name "*.cfg" \ @@ -77,6 +78,13 @@ find $RPM_BUILD_ROOT%{_sysconfdir}/mock -name "*.cfg" \ # just for %%ghosting purposes ln -s fedora-rawhide-x86_64.cfg $RPM_BUILD_ROOT%{_sysconfdir}/mock/default.cfg +if [ -d $RPM_BUILD_ROOT%{_datadir}/bash-completion ]; then + echo %{_datadir}/bash-completion/completions/mock >> %{name}.cfgs + echo %{_datadir}/bash-completion/completions/mockchain >> %{name}.cfgs +elif [ -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d ]; then + echo %{_sysconfdir}/bash_completion.d/mock >> %{name}.cfgs +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -130,7 +138,6 @@ ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg %config(noreplace) %{_sysconfdir}/%{name}/*.ini %config(noreplace) %{_sysconfdir}/pam.d/%{name} %config(noreplace) %{_sysconfdir}/security/console.apps/%{name} -%{_sysconfdir}/bash_completion.d # docs %{_mandir}/man1/mock.1* @@ -147,6 +154,32 @@ ln -s -f $cfg %{_sysconfdir}/%{name}/default.cfg %{python_sitelib}/mockbuild/scm.py* %changelog +* Mon Mar 24 2014 Clark Williams - 1.1.37-1 +- fix thinko in test script for running configs +- plugins: turn off package_state plugin by default +- fix automake to use 'xz' compression +- additional commits needed by scm commit +- elevate privs when accessing the chroot rpmdb [BZ# 1051474] +- quote --shell args like a shell [BZ# 966144] +- from Tuomo Soini + - Fix for race in directory creation [BZ# 1052045] +- from Peter Jönsson + - Add support for creating tarballs with scm data still inside +- from Tomas Kopecek + - internal_dev_setup option used consistently +- from Dennis Gilmore + - add rawhide aarch64 config + - remove sparc rawhide configs, she be dead +- from Ville Skyttä + - Use $(mocketcdir) in install-data-hook instead of duplicating its value + - Use xz tarball to save a bit of space + - Clean up unused imports + - Install bash completion to proper dir with bash-completion 2 + - Remove Fedora 18 configs + - Use install @foo instead of groupinstall foo in chroot_setup_cmd +- from Rodrigo Dias Cruz + - fix scm problem with specfiles using rpm macros [BZ# 1056271] + * Wed Feb 5 2014 Clark Williams - 1.1.36-1 - configs: first cut at epel-7 configs for x86_64 and ppc64 - Add 'extra_chroot_dirs' config option diff --git a/sources b/sources index c634cfb..b74089d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -808f9b7dcef01520e0b8515eedaaf406 mock-1.1.36.tar.gz +f1e1740accff7fe50544520bf2aa665a mock-1.1.37.tar.xz