Accepting request 849686 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849686
OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=108
This commit is contained in:
Dr. Werner Fink 2020-11-20 14:46:09 +00:00 committed by Git OBS Bridge
parent bd6957e374
commit 5567a70f62
2 changed files with 13 additions and 7 deletions

View File

@ -21,6 +21,11 @@ Fri Nov 20 11:48:50 UTC 2020 - Dr. Werner Fink <werner@suse.de>
* tcsh-6.22.02-history-merge.dif
* tcsh-6.22.02-workaround-common.patch
-------------------------------------------------------------------
Fri Oct 16 10:20:03 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
-------------------------------------------------------------------
Wed Jul 15 07:34:33 UTC 2020 - Dr. Werner Fink <werner@suse.de>

View File

@ -102,7 +102,6 @@ correction, a history mechanism, job control, and a C-like syntax.
%endif
./configure --build=${CPU}-suse-linux \
--prefix=/usr \
--bindir=/bin \
--sysconfdir=/etc \
--localstatedir=/var \
--sharedstatedir=%{_datadir} \
@ -178,21 +177,23 @@ correction, a history mechanism, job control, and a C-like syntax.
mkdir -p %{buildroot}%{_prefix}/bin
install -m 644 $RPM_SOURCE_DIR/bindkey.tcsh %{buildroot}%{_sysconfdir}/profile.d/
install -m 644 $RPM_SOURCE_DIR/complete.tcsh %{buildroot}%{_sysconfdir}/profile.d/
rm -f %{buildroot}/bin/csh
rm -f %{buildroot}%{_bindir}/csh
rm -f %{buildroot}%{_bindir}/tcsh
rm -f %{buildroot}%{_mandir}/man1/csh.*
rm -rf %{buildroot}%{_datadir}/locale/C
ln -sf tcsh %{buildroot}/bin/csh
ln -sf tcsh %{buildroot}/%{_bindir}/csh
ln -sf tcsh.1.gz %{buildroot}%{_mandir}/man1/csh.1.gz
ln -sf ../../bin/tcsh %{buildroot}%{_bindir}/csh
ln -sf ../../bin/tcsh %{buildroot}%{_bindir}/tcsh
%if !0%{?usrmerged}
mkdir -p %{buildroot}/bin
ln -s %{_bindir}/tcsh %{buildroot}/bin/tcsh
ln -s %{_bindir}/tcsh %{buildroot}/bin/csh
%endif
%files
%defattr(-,root,root)
%dir %{_docdir}/tcsh
%if !0%{?usrmerged}
/bin/csh
/bin/tcsh
%endif
%config %{_sysconfdir}/profile.d/bindkey.tcsh
%config %{_sysconfdir}/profile.d/complete.tcsh
%{_bindir}/csh