0.50.34, remove traces of python2 package and build the main package for python 2.2

diff --git a/Makefile.in b/Makefile.in
index f61c31c998ae3d2124a83c86deb6b813dfd58cf5..c7d1c6b854db8336c8b88d3f3d9d5aee70e3efc5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,8 +30,8 @@ includedir = $(prefix)/include
 libdir = $(prefix)/lib
 bindir = $(prefix)/bin
 ARCHNAME = $(shell uname -m | sed 's/i.86/i386/')
-pythondir = $(prefix)/lib/python1.5
-pythonbindir = $(prefix)/lib/python1.5/lib-dynload
+pythondir = $(prefix)/lib/python2.2
+pythonbindir = $(prefix)/lib/python2.2/lib-dynload
 
 #--------------------------------------
 
@@ -61,7 +61,7 @@ _snackmodule.so:   snackmodule.o $(LIBNEWTSH)
        gcc --shared $(SHCFLAGS) -o _snackmodule.so snackmodule.o -L . $(LIBNEWTSH)
 
 snackmodule.o:   snackmodule.c
-       gcc -I/usr/include/python1.5 -fPIC $(CFLAGS) -c snackmodule.c
+       gcc -I/usr/include/python2.2 -fPIC $(CFLAGS) -c snackmodule.c
 
 whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
        gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt

diff --git a/configure.in b/configure.in
index af33c25e18122359147ea35d979684a5fefa3008..50a484b6551450717b8057bc80643ea874344ab3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h)
 
 VERSION=$(awk '/^%define version/ {print $3}' newt.spec)
 
-VERSION=0.50.33
+VERSION=0.50.34
 SONAME=0.50
 AC_SUBST(VERSION)
 AC_SUBST(SONAME)

diff --git a/newt.spec b/newt.spec
index f2bbc6481a0a1559ca61594c0d78425210005fa5..dcc9674e58c5f05f45d5058c1fa3938a8fea056c 100644 (file)
--- a/newt.spec
+++ b/newt.spec
@@ -1,6 +1,6 @@
 Summary: A development library for text mode user interfaces.
 Name: newt
-%define version 0.50.33
+%define version 0.50.34
 Version: %{version}
 Release: 1
 License: LGPL
@@ -16,11 +16,6 @@ Summary: Newt windowing toolkit development files.
 Requires: slang-devel %{name} = %{version}
 Group: Development/Libraries
 
-%package python2
-Summary: Snack for python2
-Requires: python2
-Group: System Environment/Libraries
-
 %Description
 Newt is a programming library for color text mode, widget based user
 interfaces.  Newt can be used to add stacked windows, entry widgets,
@@ -39,8 +34,6 @@ the slang library.
 Install newt-devel if you want to develop applications which will use
 newt.
 
-%description python2
-The newt-python2 package contains a snack module for python2.
 
 %prep
 %setup
@@ -59,17 +52,7 @@ mkdir -p $RPM_BUILD_ROOT
 make instroot=$RPM_BUILD_ROOT install
 make instroot=$RPM_BUILD_ROOT install-sh
 
-python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/usr/lib/python1.5",10,"/usr/lib/python1.5")'
-
-%if 0
-# cheat... build python2 stuff here
-make clean
-perl -pi -e "s/python1.5/python2.0/g" *
-./configure
-make instroot=$RPM_BUILD_ROOT install
-make instroot=$RPM_BUILD_ROOT install-sh
-python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/usr/lib/python2.0",10,"/usr/lib/python2.0")'
-%endif
+python -c 'from compileall import *; compile_dir("'$RPM_BUILD_ROOT'/usr/lib/python2.2",10,"/usr/lib/python2.2")'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,8 +71,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES COPYING
 /usr/lib/libnewt.so.*
 /usr/bin/whiptail
-/usr/lib/python1.5/snack.py*
-/usr/lib/python1.5/lib-dynload/_snackmodule.so
+/usr/lib/python2.2/snack.py*
+/usr/lib/python2.2/lib-dynload/_snackmodule.so
 
 %files devel
 %defattr (-,root,root)
@@ -98,13 +81,11 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/libnewt.a
 /usr/lib/libnewt.so
 
-%if 0
-%files python2
-%defattr (-,root,root)
-/usr/lib/python2.0
-%endif
-
 %changelog
+* Fri Sep 15 2001 Trond Eivind Glomsrød <teg@redhat.com> 0.50.34-1
+- remove python2 subpackage
+- compile package for python 2.2
+
 * Wed Aug 29 2001 Trond Eivind Glomsrød <teg@redhat.com> 0.50.33-1
 - s/Copyright/License/
 - Add slang-devel to build dependencies (#49542)