Do not install the bash-completion code in /etc
This commit is contained in:
parent
9a8fb69bfd
commit
9092805558
@ -62,7 +62,8 @@ EXTRA_DIST = \
|
|||||||
intltool-update.in \
|
intltool-update.in \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
DISTCHECK_CONFIGURE_FLAGS = \
|
DISTCHECK_CONFIGURE_FLAGS = \
|
||||||
|
--disable-bash-completion \
|
||||||
--enable-gtk-doc \
|
--enable-gtk-doc \
|
||||||
--with-security-framework=dummy \
|
--with-security-framework=dummy \
|
||||||
--with-systemdsystemunitdir=/tmp \
|
--with-systemdsystemunitdir=/tmp \
|
||||||
|
10
configure.ac
10
configure.ac
@ -296,6 +296,16 @@ else
|
|||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAVE_XSLTPROC, [test "$XSLTPROC" != "no"])
|
AM_CONDITIONAL(HAVE_XSLTPROC, [test "$XSLTPROC" != "no"])
|
||||||
|
|
||||||
|
dnl **** Bash completion ****
|
||||||
|
AC_ARG_ENABLE(bash_completion, AS_HELP_STRING([--enable-bash-completion],[Enable bash completion]),
|
||||||
|
enable_bash_completion=$enableval, enable_bash_completion=yes)
|
||||||
|
if test x$enable_bash_completion != xno; then
|
||||||
|
PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0])
|
||||||
|
BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`"
|
||||||
|
AC_SUBST([BASH_COMPLETIONS_DIR])
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$enable_bash_completion" = "xyes"])
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl - Make paths available for source files
|
dnl - Make paths available for source files
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
@ -40,8 +40,10 @@ if PK_BUILD_SYSTEMD_UPDATES
|
|||||||
SUBDIRS += systemd-updates
|
SUBDIRS += systemd-updates
|
||||||
endif
|
endif
|
||||||
|
|
||||||
bashcompletiondir = ${SYSCONFDIR}/bash_completion.d
|
if HAVE_BASH_COMPLETION
|
||||||
dist_bashcompletion_DATA = pk-completion.bash
|
bashcompletiondir = $(BASH_COMPLETIONS_DIR)
|
||||||
|
dist_bashcompletion_DATA = pkcon
|
||||||
|
endif
|
||||||
|
|
||||||
script_SCRIPTS = \
|
script_SCRIPTS = \
|
||||||
packagekit-bugreport.sh
|
packagekit-bugreport.sh
|
||||||
|
@ -50,6 +50,9 @@ BuildRequires: fontconfig-devel
|
|||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
BuildRequires: gobject-introspection-devel
|
BuildRequires: gobject-introspection-devel
|
||||||
BuildRequires: zif-devel >= 0.2.5
|
BuildRequires: zif-devel >= 0.2.5
|
||||||
|
%if !0%{?rhel}
|
||||||
|
BuildRequires: bash-completion
|
||||||
|
%endif
|
||||||
|
|
||||||
# functionality moved to udev itself
|
# functionality moved to udev itself
|
||||||
Obsoletes: PackageKit-udev-helper < %{version}-%{release}
|
Obsoletes: PackageKit-udev-helper < %{version}-%{release}
|
||||||
@ -300,9 +303,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
|
|||||||
%ghost %verify(not md5 size mtime) %{_localstatedir}/cache/PackageKit/groups.sqlite
|
%ghost %verify(not md5 size mtime) %{_localstatedir}/cache/PackageKit/groups.sqlite
|
||||||
%dir %{_localstatedir}/cache/PackageKit/downloads
|
%dir %{_localstatedir}/cache/PackageKit/downloads
|
||||||
%{python_sitelib}/packagekit/*py*
|
%{python_sitelib}/packagekit/*py*
|
||||||
%dir %{_sysconfdir}/bash_completion.d
|
%if !0%{?rhel}
|
||||||
|
%{_datadir}/bash-completion/completions/pkcon
|
||||||
|
%endif
|
||||||
%dir %{_libdir}/packagekit-backend
|
%dir %{_libdir}/packagekit-backend
|
||||||
%config %{_sysconfdir}/bash_completion.d/pk-completion.bash
|
|
||||||
%config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
|
%config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
|
||||||
%config(noreplace) %{_sysconfdir}/PackageKit/Vendor.conf
|
%config(noreplace) %{_sysconfdir}/PackageKit/Vendor.conf
|
||||||
%config %{_sysconfdir}/dbus-1/system.d/*
|
%config %{_sysconfdir}/dbus-1/system.d/*
|
||||||
|
Loading…
Reference in New Issue
Block a user