diff --git a/ncurses.spec b/ncurses.spec index 21451a7..a5029ea 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -16,6 +16,7 @@ BuildRequires: gpm-devel pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} +Conflicts: filesystem < 3 %description The curses library routines are a terminal-independent method of @@ -142,14 +143,6 @@ make -C widec DESTDIR=$RPM_BUILD_ROOT install.{libs,includes,man} chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.* chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a -# move lib{ncurses{,w},tinfo}.so.* to /lib* -mkdir $RPM_BUILD_ROOT/%{_lib} -mv $RPM_BUILD_ROOT%{_libdir}/lib{ncurses{,w},tinfo}.so.* $RPM_BUILD_ROOT/%{_lib} -for l in $RPM_BUILD_ROOT%{_libdir}/lib{ncurses{,w},tinfo}.so; do - ln -sf $(echo %{_libdir} | \ - sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l -done - mkdir -p $RPM_BUILD_ROOT{%{rootdatadir},%{_sysconfdir}}/terminfo # move few basic terminfo entries to /lib @@ -235,7 +228,6 @@ bzip2 NEWS %files libs %defattr(-,root,root) -/%{_lib}/lib*.so.* %{_libdir}/lib*.so.* %files base -f terms.base