[ncurses/f17] move libs and terms to /usr
Miroslav Lichvar
mlichvar at fedoraproject.org
Wed Feb 8 16:04:14 UTC 2012
commit bf2283567eb5c67e316e5122d6e5cad287ad2e68
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Wed Feb 8 16:52:34 2012 +0100
move libs and terms to /usr
ncurses.spec | 36 +++++-------------------------------
1 files changed, 5 insertions(+), 31 deletions(-)
---
diff --git a/ncurses.spec b/ncurses.spec
index cbd62af..85b4649 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -51,6 +51,8 @@ Group: System Environment/Base
Obsoletes: termcap < 1:5.5-2
# base introduced in 5.6-13
Conflicts: ncurses < 5.6-13
+# /lib -> /usr/lib move
+Conflicts: filesystem < 3
%description base
This package contains descriptions of common terminals. Other terminal
@@ -109,11 +111,10 @@ for f in ANNOUNCE; do
done
%build
-%define rootdatadir /lib
%define ncurses_options \\\
--with-shared --without-ada --with-ospeed=unsigned \\\
--enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
- --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
+ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \\\
--enable-overwrite \\\
--enable-pc-files \\\
--with-pkg-config-libdir=%{_libdir}/pkgconfig \\\
@@ -143,38 +144,13 @@ 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
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/terminfo
-# move few basic terminfo entries to /lib
baseterms=
-for termname in \
- ansi dumb linux vt100 vt100-nav vt102 vt220 vt52
-do
- for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo \
- -samefile $RPM_BUILD_ROOT%{_datadir}/terminfo/${termname::1}/$termname)
- do
- baseterms="$baseterms $(basename $t)"
- done
-done
-for termname in $baseterms; do
- termpath=terminfo/${termname::1}/$termname
- mkdir $RPM_BUILD_ROOT%{rootdatadir}/terminfo/${termname::1} &> /dev/null || :
- mv $RPM_BUILD_ROOT%{_datadir}/$termpath $RPM_BUILD_ROOT%{rootdatadir}/$termpath
- ln -s $(dirname %{_datadir}/$termpath | \
- sed 's,\(^/\|\)[^/][^/]*,..,g')%{rootdatadir}/$termpath \
- $RPM_BUILD_ROOT%{_datadir}/$termpath
-done
# prepare -base and -term file lists
for termname in \
+ ansi dumb linux vt100 vt100-nav vt102 vt220 vt52 \
Eterm\* aterm bterm cons25 cygwin eterm\* gnome gnome-256color hurd jfbterm \
konsole konsole-256color mach\* mlterm mrxvt nsterm putty\* pcansi \
rxvt rxvt-\* screen screen-\*color screen.\* sun teraterm teraterm2.3 \
@@ -236,14 +212,12 @@ bzip2 NEWS
%files libs
%defattr(-,root,root)
-/%{_lib}/lib*.so.*
%{_libdir}/lib*.so.*
%files base -f terms.base
%defattr(-,root,root)
%doc README
%dir %{_sysconfdir}/terminfo
-%{rootdatadir}/terminfo
%{_datadir}/tabset
%dir %{_datadir}/terminfo
More information about the scm-commits
mailing list