[ncurses/f18] remove obsolete macros

Miroslav Lichvar mlichvar at fedoraproject.org
Mon Oct 15 17:11:27 UTC 2012


commit 749234d71ce8fed24b50d543a6c67afad562e7dc
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Mon Oct 15 14:44:32 2012 +0200

    remove obsolete macros

 ncurses.spec |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/ncurses.spec b/ncurses.spec
index 1734320..1f6bc67 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -14,7 +14,6 @@ Patch9: ncurses-libs.patch
 Patch11: ncurses-urxvt.patch
 Patch12: ncurses-kbs.patch
 BuildRequires: gpm-devel pkgconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -111,7 +110,7 @@ for f in ANNOUNCE; do
 done
 
 %build
-%define ncurses_options \\\
+%global ncurses_options \\\
     --with-shared --without-ada --with-ospeed=unsigned \\\
     --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
     --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \\\
@@ -135,8 +134,6 @@ make %{?_smp_mflags} libs
 cd ..
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-
 make -C narrowc DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.*
 make -C widec DESTDIR=$RPM_BUILD_ROOT install.{libs,includes,man}
@@ -203,7 +200,6 @@ bzip2 NEWS
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc ANNOUNCE AUTHORS NEWS.bz2 README TO-DO
 %{_bindir}/[cirt]*
 %{_mandir}/man1/[cirt]*
@@ -211,21 +207,17 @@ bzip2 NEWS
 %{_mandir}/man7/*
 
 %files libs
-%defattr(-,root,root)
 %{_libdir}/lib*.so.*
 
 %files base -f terms.base
-%defattr(-,root,root)
 %doc README
 %dir %{_sysconfdir}/terminfo
 %{_datadir}/tabset
 %dir %{_datadir}/terminfo
 
 %files term -f terms.term
-%defattr(-,root,root)
 
 %files devel
-%defattr(-,root,root)
 %doc test
 %doc doc/html/hackguide.html
 %doc doc/html/ncurses-intro.html
@@ -243,12 +235,8 @@ bzip2 NEWS
 %{_mandir}/man3/*
 
 %files static
-%defattr(-,root,root)
 %{_libdir}/lib*.a
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
 %changelog
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.9-5.20120204
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild


More information about the scm-commits mailing list