uses a buildroot in package build; version 0.12 (soname 0.11)

diff --git a/Makefile b/Makefile
index 6d60de6e1155b9d9f618168e03fd6c075a5b6619..9fc9880dcd2dce5fc480218bd2718bf1e691d44d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ ifeq ($(RPM_OPT_FLAGS),)
 CFLAGS += -g -O2
 endif
 
-VERSION = 0.11
+VERSION = 0.12
+CVSTAG = r$(subst .,-,$(VERSION))
 SONAME = 0.11
 
 PROGS = test whiptail whiptcl.so testgrid
@@ -62,7 +63,7 @@ veryclean: clean
        rm -f .depend
 
 clean:
-       rm -f $(PROGS) $(NDIALOGOBJS) $(TESTOBJS) $(OBJS) $(LIBOBJS) $(LIBNEWT) core $(LIBNEWTSH)  \
+       rm -f $(PROGS) *.o $(LIBNEWT) core $(LIBNEWTSH)  \
                $(SHAREDOBJS) *.so*
 
 depend:
@@ -83,36 +84,30 @@ $(SHAREDDIR)/newt.o: newt.c Makefile
        $(CC) $(SHCFLAGS) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
 
 
-install: $(LIBNEWT)
-       [ -d $(bindir) ] || install -m 755 -d $(bindir)
-       [ -d $(libdir) ] || install -m 755 -d $(libdir)
-       [ -d $(includedir) ] || install -m 755 -d $(includedir)
-       install -m 644 newt.h $(includedir)
-       install -m 644 $(LIBNEWT) $(libdir)
-       install -s -m 755 whiptail $(bindir)
+install: $(LIBNEWT) whiltail
+       [ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir)
+       [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
+       [ -d $(instroot)/$(includedir) ] || install -m 755 -d $(instroot)/$(includedir)
+       install -m 644 newt.h $(instroot)/$(includedir)
+       install -m 644 $(LIBNEWT) $(instroot)/$(libdir)
+       install -s -m 755 whiptail $(instroot)/$(bindir)
 
 install-sh: sharedlib
-       install -m 755 $(LIBNEWTSH) $(libdir)
-       ln -sf $(LIBNEWTSH) $(libdir)/libnewt.so
-       install -m 755 whiptcl.so $(libdir)
-       /sbin/ldconfig
+       install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
+       ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/libnewt.so
+       install -m 755 whiptcl.so $(instroot)/$(libdir)
 
 archive: 
+       @cvs tag -F $(CVSTAG)
        @rm -rf /tmp/newt-$(VERSION)
        @mkdir /tmp/newt-$(VERSION)
-       @tar cSpf - * | (cd /tmp/newt-$(VERSION); tar xSpf -)
-       @cd /tmp/newt-$(VERSION); \
-           make clean; \
-           find . -name "RCS" -exec rm {} \;  ; \
-           find . -name ".depend" -exec rm {} \;  ; \
-           rm -rf *gz test shared showchars
+       @cvs export -r$(CVSTAG) -d /tmp/newt-$(VERSION) newt
        @cd /tmp; tar czSpf newt-$(VERSION).tar.gz newt-$(VERSION)
        @rm -rf /tmp/newt-$(VERSION)
        @cp /tmp/newt-$(VERSION).tar.gz .
        @rm -f /tmp/newt-$(VERSION).tar.gz 
        @echo " "
-       @echo "The final archive is ./newt-$(VERSION).tar.gz. You should run"
-       @echo "cvs tag v$(VERSION) now."
+       @echo "The final archive is ./newt-$(VERSION).tar.gz."
 
 ifeq (.depend,$(wildcard .depend))
 include .depend

diff --git a/newt.spec b/newt.spec
index 6b792f97fefebb844b8c6db8308d016312184db4..931477d1da5bea1bd70b47bbcfc8f7d4bca9edd9 100644 (file)
--- a/newt.spec
+++ b/newt.spec
@@ -1,15 +1,17 @@
 Summary: Not Erik's Windowing Toolkit - text mode windowing with slang
 Name: newt
-Version: 0.11
+%define verison 0.12
+Version: %{version}
 Release: 1
 Copyright: LGPL
 Group: Libraries
-Source: ftp://ftp.redhat.com/pub/redhat/code/newt/newt-0.11.tar.gz
+Source: ftp://ftp.redhat.com/pub/redhat/code/newt/newt-%{version}.tar.gz
 Requires: slang
 %package devel
 Summary: Developer's toolkit for newt windowing library
 Requires: slang-devel
 Group: Libraries
+BuildRoot: /var/tmp/newtroot
 
 %description
 Newt is a windowing toolkit for text mode built from the slang library. It
@@ -33,9 +35,13 @@ make
 make shared
 
 %install
-rm -rf /usr/lib/libnewt*
-make install
-make install-sh
+rm -rf $(RPM_BUILD_ROOT)
+mkdir -p $(RPM_BUILD_ROOT)
+make instroot=$(RPM_BUILD_ROOT) install
+make instroot=$(RPM_BUILD_ROOT) install-sh
+
+%clean
+rm -rf $(RPM_BUILD_ROOT)
 
 %post -p /sbin/ldconfig
 
@@ -43,6 +49,11 @@ make install-sh
 
 %changelog
 
+* Tue Oct 07 1997 Erik Troan <ewt@redhat.com>
+
+- made Make/spec files use a buildroot
+- added grid support (for newt 0.11 actually)
+
 * Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
 
 - Added patched from Clarence Smith for setting the size of a listbox
@@ -66,6 +77,7 @@ make install-sh
 %files
 /usr/lib/libnewt.so.*
 /usr/bin/whiptail
+/usr/lib/whiptcl.so
 
 %files devel
 /usr/include/newt.h