3
0
forked from pool/util-linux

Accepting request 391743 from home:sbrabec:branches:util-linux-bsc977259

- Remove incorrect --with-bashcompletiondir that breaks
  bash-completion, use path in bash-completion.pc instead
  (boo#977259).

OBS-URL: https://build.opensuse.org/request/show/391743
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=305
This commit is contained in:
Dirk Mueller 2016-04-26 22:14:30 +00:00 committed by Git OBS Bridge
parent f7f92f04d8
commit a15bb30f60
6 changed files with 45 additions and 30 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com
- Remove incorrect --with-bashcompletiondir that breaks
bash-completion, use path in bash-completion.pc instead
(boo#977259).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de

View File

@ -75,6 +75,7 @@ Summary: %main_summary
License: GPL-2.0+ License: GPL-2.0+
Group: %main_group Group: %main_group
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bash-completion
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
BuildRequires: fdupes BuildRequires: fdupes
@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi
--with-ncurses \ --with-ncurses \
--with-selinux \ --with-selinux \
$uhead \ $uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
--with-systemdsystemunitdir=%{_unitdir} \ --with-systemdsystemunitdir=%{_unitdir} \
--enable-libmount-force-mountinfo \ --enable-libmount-force-mountinfo \
--enable-sulogin-emergency-mount \ --enable-sulogin-emergency-mount \
@ -1131,13 +1131,11 @@ fi
%dir %{_datadir}/getopt %dir %{_datadir}/getopt
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
# FIXME: Fix directory ownership. %{_datadir}/bash-completion/completions/*
%dir %{_datadir}/bash-completion
%{_datadir}/bash-completion/*
%if %build_util_linux_systemd %if %build_util_linux_systemd
%exclude %{_datadir}/bash-completion/logger %exclude %{_datadir}/bash-completion/completions/logger
%exclude %{_datadir}/bash-completion/lslogins %exclude %{_datadir}/bash-completion/completions/lslogins
%exclude %{_datadir}/bash-completion/uuidd %exclude %{_datadir}/bash-completion/completions/uuidd
%endif %endif
%ifnarch ia64 m68k %ifnarch ia64 m68k
#XXX: post our patches upstream #XXX: post our patches upstream
@ -1267,8 +1265,8 @@ fi
/bin/logger /bin/logger
%{_bindir}/logger %{_bindir}/logger
%{_bindir}/lslogins %{_bindir}/lslogins
%{_datadir}/bash-completion/logger %{_datadir}/bash-completion/completions/logger
%{_datadir}/bash-completion/lslogins %{_datadir}/bash-completion/completions/lslogins
%{_mandir}/man1/logger.1.gz %{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz %{_mandir}/man1/lslogins.1.gz
%{_sbindir}/rcfstrim %{_sbindir}/rcfstrim
@ -1281,7 +1279,7 @@ fi
%attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid
%ghost %{_localstatedir}/lib/libuuid/clock.txt %ghost %{_localstatedir}/lib/libuuid/clock.txt
%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
%{_datadir}/bash-completion/uuidd %{_datadir}/bash-completion/completions/uuidd
%{_mandir}/man8/uuidd.8.gz %{_mandir}/man8/uuidd.8.gz
%{_sbindir}/rcuuidd %{_sbindir}/rcuuidd
%{_unitdir}/uuidd.service %{_unitdir}/uuidd.service

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com
- Remove incorrect --with-bashcompletiondir that breaks
bash-completion, use path in bash-completion.pc instead
(boo#977259).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de

View File

@ -75,6 +75,7 @@ Summary: %main_summary
License: GPL-2.0+ License: GPL-2.0+
Group: %main_group Group: %main_group
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bash-completion
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
BuildRequires: fdupes BuildRequires: fdupes
@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi
--with-ncurses \ --with-ncurses \
--with-selinux \ --with-selinux \
$uhead \ $uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
--with-systemdsystemunitdir=%{_unitdir} \ --with-systemdsystemunitdir=%{_unitdir} \
--enable-libmount-force-mountinfo \ --enable-libmount-force-mountinfo \
--enable-sulogin-emergency-mount \ --enable-sulogin-emergency-mount \
@ -1131,13 +1131,11 @@ fi
%dir %{_datadir}/getopt %dir %{_datadir}/getopt
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
# FIXME: Fix directory ownership. %{_datadir}/bash-completion/completions/*
%dir %{_datadir}/bash-completion
%{_datadir}/bash-completion/*
%if %build_util_linux_systemd %if %build_util_linux_systemd
%exclude %{_datadir}/bash-completion/logger %exclude %{_datadir}/bash-completion/completions/logger
%exclude %{_datadir}/bash-completion/lslogins %exclude %{_datadir}/bash-completion/completions/lslogins
%exclude %{_datadir}/bash-completion/uuidd %exclude %{_datadir}/bash-completion/completions/uuidd
%endif %endif
%ifnarch ia64 m68k %ifnarch ia64 m68k
#XXX: post our patches upstream #XXX: post our patches upstream
@ -1267,8 +1265,8 @@ fi
/bin/logger /bin/logger
%{_bindir}/logger %{_bindir}/logger
%{_bindir}/lslogins %{_bindir}/lslogins
%{_datadir}/bash-completion/logger %{_datadir}/bash-completion/completions/logger
%{_datadir}/bash-completion/lslogins %{_datadir}/bash-completion/completions/lslogins
%{_mandir}/man1/logger.1.gz %{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz %{_mandir}/man1/lslogins.1.gz
%{_sbindir}/rcfstrim %{_sbindir}/rcfstrim
@ -1281,7 +1279,7 @@ fi
%attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid
%ghost %{_localstatedir}/lib/libuuid/clock.txt %ghost %{_localstatedir}/lib/libuuid/clock.txt
%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
%{_datadir}/bash-completion/uuidd %{_datadir}/bash-completion/completions/uuidd
%{_mandir}/man8/uuidd.8.gz %{_mandir}/man8/uuidd.8.gz
%{_sbindir}/rcuuidd %{_sbindir}/rcuuidd
%{_unitdir}/uuidd.service %{_unitdir}/uuidd.service

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com
- Remove incorrect --with-bashcompletiondir that breaks
bash-completion, use path in bash-completion.pc instead
(boo#977259).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de

View File

@ -75,6 +75,7 @@ Summary: %main_summary
License: GPL-2.0+ License: GPL-2.0+
Group: %main_group Group: %main_group
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bash-completion
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
BuildRequires: fdupes BuildRequires: fdupes
@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi
--with-ncurses \ --with-ncurses \
--with-selinux \ --with-selinux \
$uhead \ $uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
--with-systemdsystemunitdir=%{_unitdir} \ --with-systemdsystemunitdir=%{_unitdir} \
--enable-libmount-force-mountinfo \ --enable-libmount-force-mountinfo \
--enable-sulogin-emergency-mount \ --enable-sulogin-emergency-mount \
@ -1131,13 +1131,11 @@ fi
%dir %{_datadir}/getopt %dir %{_datadir}/getopt
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
# FIXME: Fix directory ownership. %{_datadir}/bash-completion/completions/*
%dir %{_datadir}/bash-completion
%{_datadir}/bash-completion/*
%if %build_util_linux_systemd %if %build_util_linux_systemd
%exclude %{_datadir}/bash-completion/logger %exclude %{_datadir}/bash-completion/completions/logger
%exclude %{_datadir}/bash-completion/lslogins %exclude %{_datadir}/bash-completion/completions/lslogins
%exclude %{_datadir}/bash-completion/uuidd %exclude %{_datadir}/bash-completion/completions/uuidd
%endif %endif
%ifnarch ia64 m68k %ifnarch ia64 m68k
#XXX: post our patches upstream #XXX: post our patches upstream
@ -1267,8 +1265,8 @@ fi
/bin/logger /bin/logger
%{_bindir}/logger %{_bindir}/logger
%{_bindir}/lslogins %{_bindir}/lslogins
%{_datadir}/bash-completion/logger %{_datadir}/bash-completion/completions/logger
%{_datadir}/bash-completion/lslogins %{_datadir}/bash-completion/completions/lslogins
%{_mandir}/man1/logger.1.gz %{_mandir}/man1/logger.1.gz
%{_mandir}/man1/lslogins.1.gz %{_mandir}/man1/lslogins.1.gz
%{_sbindir}/rcfstrim %{_sbindir}/rcfstrim
@ -1281,7 +1279,7 @@ fi
%attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid
%ghost %{_localstatedir}/lib/libuuid/clock.txt %ghost %{_localstatedir}/lib/libuuid/clock.txt
%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
%{_datadir}/bash-completion/uuidd %{_datadir}/bash-completion/completions/uuidd
%{_mandir}/man8/uuidd.8.gz %{_mandir}/man8/uuidd.8.gz
%{_sbindir}/rcuuidd %{_sbindir}/rcuuidd
%{_unitdir}/uuidd.service %{_unitdir}/uuidd.service