[createrepo] move bash-completion scripts to /usr/share/

Zdeněk Pavlas zpavlas at fedoraproject.org
Tue Mar 19 09:39:53 UTC 2013


commit 9c1335c89a2d5eaa87b22afce0a9d27c869a0bea
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Tue Mar 19 10:38:20 2013 +0100

    move bash-completion scripts to /usr/share/

 createrepo-head.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 createrepo.spec       |    7 +++++--
 2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/createrepo-head.patch b/createrepo-head.patch
index 9eb7b56..7ee1dc6 100644
--- a/createrepo-head.patch
+++ b/createrepo-head.patch
@@ -1822,3 +1822,44 @@ index eb35ef7..b67b5bd 100755
 -    
  if __name__ == "__main__":
      main(sys.argv[1:])
+commit 24b6f750b382781d5c257e4afdd04f30488d6da5
+Author: Zdenek Pavlas <zpavlas at redhat.com>
+Date:   Tue Mar 19 10:00:01 2013 +0100
+
+    move bash-completion scripts to /usr/share/  BZ 923001
+
+diff --git a/Makefile b/Makefile
+index 60bb9db..d23ad8b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@ pkgincludedir = $(includedir)/$(PKGNAME)
+ top_builddir = 
+ 
+ # all dirs
+-DIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)/bash_completion.d \
++DIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/bash-completion/completions \
+ 	$(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir)
+ 
+ 
+@@ -65,7 +65,7 @@ check:
+ 
+ install: all installdirs
+ 	$(INSTALL_MODULES) $(srcdir)/$(MODULES) $(DESTDIR)$(pkgdatadir)
+-	$(INSTALL_DATA) $(PKGNAME).bash $(DESTDIR)$(sysconfdir)/bash_completion.d
++	$(INSTALL_DATA) $(PKGNAME).bash $(DESTDIR)$(datadir)/bash-completion/completions/$(PKGNAME)
+ 	for subdir in $(SUBDIRS) ; do \
+ 	  $(MAKE) -C $$subdir install VERSION=$(VERSION) PKGNAME=$(PKGNAME); \
+ 	done
+diff --git a/createrepo.spec b/createrepo.spec
+index eea7092..e94b36b 100644
+--- a/createrepo.spec
++++ b/createrepo.spec
+@@ -32,7 +32,7 @@ make DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install
+ %defattr(-, root, root)
+ %dir %{_datadir}/%{name}
+ %doc ChangeLog README COPYING COPYING.lib
+-%{_sysconfdir}/bash_completion.d/
++%{_datadir}/bash-completion/completions/createrepo
+ %{_datadir}/%{name}/*
+ %{_bindir}/%{name}
+ %{_bindir}/modifyrepo
diff --git a/createrepo.spec b/createrepo.spec
index 4bdf6fb..5e69e42 100644
--- a/createrepo.spec
+++ b/createrepo.spec
@@ -3,7 +3,7 @@
 Summary: Creates a common metadata repository
 Name: createrepo
 Version: 0.9.9
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root,-)
 %doc ChangeLog README COPYING COPYING.lib
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/bash-completion/completions/createrepo
 %{_datadir}/%{name}/
 %{_bindir}/createrepo
 %{_bindir}/modifyrepo
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/createrepo
 
 %changelog
+* Tue Mar 19 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.9.9-17
+- move bash-completion scripts to /usr/share/  BZ 923001
+
 * Wed Mar  6 2013 Zdenek Pavlas <zpavlas at redhat.com> - 0.9.9-16
 - update to latest HEAD
 - turn off stdout buffering in worker to prevent a deadlock


More information about the scm-commits mailing list