[createrepo] add BuildRequires: bash-completion
Zdeněk Pavlas
zpavlas at fedoraproject.org
Wed Mar 20 15:28:30 UTC 2013
commit 6a88f11b9a21dd753945417c731b3c32cb6f4076
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date: Wed Mar 20 16:22:05 2013 +0100
add BuildRequires: bash-completion
createrepo-head.patch | 16 +++++++++-------
createrepo.spec | 8 ++++++--
2 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/createrepo-head.patch b/createrepo-head.patch
index fcc58c4..12b3d26 100644
--- a/createrepo-head.patch
+++ b/createrepo-head.patch
@@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile
-index 60bb9db..f8277fd 100644
+index 60bb9db..0b5738b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
@@ -13,7 +13,7 @@ index 60bb9db..f8277fd 100644
oldincludedir = /usr/include
mandir = ${prefix}/share/man
+compdir = $(shell pkg-config --variable=completionsdir bash-completion)
-+compdir := $(or $(compdir), "/usr/share/bash-completion/completions")
++compdir := $(or $(compdir), "/etc/bash_completion.d")
pkgdatadir = $(datadir)/$(PKGNAME)
pkglibdir = $(libdir)/$(PKGNAME)
@@ -139,7 +139,7 @@ index 54ac8b2..f5a8bb7 100644
fi
done
diff --git a/createrepo.spec b/createrepo.spec
-index 1e491cd..cfa7f61 100644
+index 1e491cd..2391b8e 100644
--- a/createrepo.spec
+++ b/createrepo.spec
@@ -1,4 +1,10 @@
@@ -148,21 +148,23 @@ index 1e491cd..cfa7f61 100644
+%define __os_install_post %{nil}
+%define compdir %(pkg-config --variable=completionsdir bash-completion)
+%if "%{compdir}" == ""
-+%define compdir "/usr/share/bash-completion/completions"
++%define compdir "/etc/bash_completion.d"
+%endif
Summary: Creates a common metadata repository
Name: createrepo
-@@ -11,7 +17,7 @@ URL: http://createrepo.baseurl.org/
+@@ -10,8 +16,9 @@ Source: %{name}-%{version}.tar.gz
+ URL: http://createrepo.baseurl.org/
BuildRoot: %{_tmppath}/%{name}-%{version}root
BuildArchitectures: noarch
++BuildRequires: bash-completion
Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1, libxml2-python
-Requires: yum-metadata-parser, yum >= 3.2.29, python-deltarpm
+Requires: yum-metadata-parser, yum >= 3.2.29, python-deltarpm, pyliblzma
%description
This utility will generate a common metadata repository from a directory of
-@@ -32,7 +38,7 @@ make DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install
+@@ -32,7 +39,7 @@ make DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install
%defattr(-, root, root)
%dir %{_datadir}/%{name}
%doc ChangeLog README COPYING COPYING.lib
@@ -171,7 +173,7 @@ index 1e491cd..cfa7f61 100644
%{_datadir}/%{name}/*
%{_bindir}/%{name}
%{_bindir}/modifyrepo
-@@ -43,6 +49,9 @@ make DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install
+@@ -43,6 +50,9 @@ make DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install
%{python_sitelib}/createrepo
%changelog
diff --git a/createrepo.spec b/createrepo.spec
index aff24f4..cf6fded 100644
--- a/createrepo.spec
+++ b/createrepo.spec
@@ -3,13 +3,13 @@
%define __os_install_post %{nil}
%define compdir %(pkg-config --variable=completionsdir bash-completion)
%if "%{compdir}" == ""
-%define compdir "/usr/share/bash-completion/completions"
+%define compdir "/etc/bash_completion.d"
%endif
Summary: Creates a common metadata repository
Name: createrepo
Version: 0.9.9
-Release: 18%{?dist}
+Release: 19%{?dist}
License: GPLv2
Group: System Environment/Base
Source: %{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Patch1: ten-changelog-limit.patch
URL: http://createrepo.baseurl.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArchitectures: noarch
+BuildRequires: bash-completion
Requires: python >= 2.1, rpm-python, rpm >= 4.1.1, libxml2-python
Requires: yum-metadata-parser, yum >= 3.4.3-4, python-deltarpm, deltarpm, pyliblzma
BuildRequires: python
@@ -53,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/createrepo
%changelog
+* Wed Mar 20 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.9.9-19
+- add BuildRequires: bash-completion
+
* Wed Mar 20 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.9.9-18
- add bash-completion aliases, use pkg-config.
More information about the scm-commits
mailing list