From 22f8b2b0daaddaf9d675a626ff3f8a45ce5ec98b Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Sep 19 2006 13:59:55 +0000
Subject: - makefile, configure and spec cleanup

- package whiptail.1 and locale files
- fix warnings

---

diff --git a/newt.spec b/newt.spec
index 3875a6f..1268ce8 100644
--- a/newt.spec
+++ b/newt.spec
@@ -2,26 +2,15 @@
 
 Summary: A development library for text mode user interfaces.
 Name: newt
-%define version 0.52.2
+%define version 0.52.3
 Version: %{version}
-Release: 9
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: newt-%{version}.tar.gz
-Patch0: newt-0.52.2-notcl.patch
-Patch1: newt-0.52.2-scrollbars.patch
-Patch2: newt-0.52.2-pgupdown-crash.patch
-Patch3: newt-0.52.2-screensize.patch
-Patch4: newt-0.52.2-cbtpos.patch
-Patch5: newt-0.52.2-focus.patch
-Patch6: newt-0.52.2-cursor.patch
-Patch7: newt-0.52.2-colors.patch
-Patch8: newt-0.52.2-pyexample.patch
-Patch9: newt-0.52.2-dwchar.patch
-BuildRequires: python, python-devel, perl, slang-devel
-Requires: slang
+BuildRequires: python, python-devel, slang-devel
 Provides: snack = %{version}-%{release}
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package devel
 Summary: Newt windowing toolkit development files.
@@ -48,34 +37,22 @@ newt.
 
 %prep
 %setup -q
-%patch0 -p1 -b .notcl
-%patch1 -p1 -b .scrollbars
-%patch2 -p1 -b .pgupdown-crash
-%patch3 -p1 -b .screensize
-%patch4 -p1 -b .cbtpos
-%patch5 -p1 -b .focus
-%patch6 -p1 -b .cursor
-%patch7 -p1 -b .colors
-%patch8 -p1 -b .pyexample
-%patch9 -p1 -b .dwchar
 
 %build
 # gpm support seems to smash the stack w/ we use help in anaconda??
 #./configure --with-gpm-support
-%configure 
-make depend
+%configure --without-tcl
 make %{?_smp_mflags} all
 chmod 0644 peanuts.py popcorn.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-%makeinstall
-
-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
+make instroot=$RPM_BUILD_ROOT install
 
 python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'%{_libdir}/python%{pythonver}",10,"%{_libdir}/python%{pythonver}")'
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,17 +60,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun -p /sbin/ldconfig
 
-%post devel -p /sbin/ldconfig
-
-%postun devel -p /sbin/ldconfig
-
-
-%files
+%files -f %{name}.lang
 %defattr (-,root,root)
 %doc COPYING
 %{_bindir}/whiptail
 %{_libdir}/libnewt.so.*
 %{_libdir}/python%{pythonver}/site-packages/*
+%{_mandir}/man1/whiptail.1*
 
 %files devel
 %defattr (-,root,root)
@@ -103,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnewt.so
 
 %changelog
+* Tue Sep 19 2006 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.3-1
+- makefile, configure and spec cleanup
+- package whiptail.1 and locale files
+- fix warnings
+
 * Fri Aug 04 2006 Miroslav Lichvar <mlichvar@redhat.com> - 0.52.2-9
 - fix screen corruption when half of double width character is overwritten
   (#137957)