diff --git a/tcsh.changes b/tcsh.changes index c84a48d..f618d83 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -21,6 +21,11 @@ Fri Nov 20 11:48:50 UTC 2020 - Dr. Werner Fink * tcsh-6.22.02-history-merge.dif * tcsh-6.22.02-workaround-common.patch +------------------------------------------------------------------- +Fri Oct 16 10:20:03 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Wed Jul 15 07:34:33 UTC 2020 - Dr. Werner Fink diff --git a/tcsh.spec b/tcsh.spec index 65717b6..66dcbca 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -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