[Commit] nickle nickle.spec.in, NONE, 1.1 .cvsignore, 1.3, 1.4 ChangeLog, 1.18, 1.19 Makefile.am, 1.50, 1.51 build-rpm, 1.5, 1.6 configure.in, 1.29, 1.30 version.m4, 1.8, 1.9 nickle.spec, 1.5, NONE

Keith Packard commit at keithp.com
Thu Apr 1 11:49:58 PST 2004 

Committed by: keithp

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv23226

Modified Files:
	.cvsignore ChangeLog Makefile.am build-rpm configure.in 
	version.m4 
Added Files:
	nickle.spec.in 
Removed Files:
	nickle.spec 
Log Message:
2004-04-01  Keith Packard  <keithp at keithp.com>

	reviewed by: Mike Harris <mharris at redhat.com>

	* .cvsignore:
	* Makefile.am:
	* build-rpm:
	* configure.in:
	* debian/.cvsignore:
	* nickle.spec:
	* nickle.spec.in:
	* version.m4:
	Mike Harris provided a new .spec file.
	
	Move .spec file to .spec.in so that version can be
	set automatically.

	Add 'rpm' target in the Makefile

	Bump version (now 2.29)


--- NEW FILE: nickle.spec.in ---
Summary: Desk calculator language, similar to C.
Name: nickle
Version: @VERSION@
Release: 1
Group: Development/Languages
License: MIT
URL: http://nickle.org

Source: http://nickle.keithp.com/nickle-%{version}.tar.gz
Buildroot: %{_tmppath}/%{name}-%{version}-root

%description
Nickle is a desk calculator language with powerful programming and scripting
capabilities.  Nickle supports a variety of datatypes, especially arbitrary
precision integers, rationals, and imprecise reals.  The input language
vaguely resembles C.  Some things in C which do not translate easily are
different, some design choices have been made differently, and a very few
features are simply missing. 

%prep

%setup -q

%build
export CFLAGS="$RPM_OPT_FLAGS"
%configure
make

%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
#mkdir -p $RPM_BUILD_ROOT%{prefix}
%makeinstall
#make prefix=$RPM_BUILD_ROOT%{prefix} install
cp -R examples $RPM_BUILD_ROOT%{_datadir}/nickle/

%files
%defattr(-,root,root)
%doc README README.name COPYING AUTHORS ChangeLog INSTALL NEWS TODO
%attr(755,root,root) %{_bindir}/nickle
%dir %{_datadir}/nickle
%{_mandir}/man1/nickle.1*
%{_datadir}/nickle/*

%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

%changelog
* Thu Mar  1 2004 Mike A. Harris <mharris at www.linux.org.uk> 2.29-2
- Initial rpm spec file

Index: .cvsignore
===================================================================
RCS file: /local/src/CVS/nickle/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/.cvsignore	10 Jul 2003 17:43:53 -0000	1.3
+++ b/.cvsignore	1 Apr 2004 19:49:56 -0000	1.4
@@ -1,3 +1,4 @@
+.deps
 Makefile
 Makefile.in
 aclocal.m4
@@ -20,8 +21,11 @@
 mkinstalldirs
 nickle
 nickle.1
+nickle.spec
 stamp-h
+stamp-h1
 stamp-h.in
+version.h
 build-stamp
 configure-stamp
 *.tar.gz

Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/ChangeLog	1 Apr 2004 19:47:39 -0000	1.18
+++ b/ChangeLog	1 Apr 2004 19:49:56 -0000	1.19
@@ -1,5 +1,26 @@
 2004-04-01  Keith Packard  <keithp at keithp.com>
 
+	reviewed by: Mike Harris <mharris at redhat.com>
+
+	* .cvsignore:
+	* Makefile.am:
+	* build-rpm:
+	* configure.in:
+	* debian/.cvsignore:
+	* nickle.spec:
+	* nickle.spec.in:
+	* version.m4:
+	Mike Harris provided a new .spec file.
+	
+	Move .spec file to .spec.in so that version can be
+	set automatically.
+
+	Add 'rpm' target in the Makefile
+
+	Bump version (now 2.29)
+
+2004-04-01  Keith Packard  <keithp at keithp.com>
+
 	* value.h:
 	Add casts to avoid warnings where sizeof (int) != sizeof (void *)
 

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- a/Makefile.am	27 Feb 2004 05:53:11 -0000	1.50
+++ b/Makefile.am	1 Apr 2004 19:49:56 -0000	1.51
@@ -20,7 +20,8 @@
 	 debian/control debian/copyright debian/rules
 	 
 EXTRA_DIST = README.name autogen.sh update-version.sh make-version.sh \
-	$(NICKLEFILES) gram.h $(EXAMPLES) $(TEST) $(DEBIAN) version.m4
+	$(NICKLEFILES) gram.h $(EXAMPLES) $(TEST) $(DEBIAN) version.m4 \
+	nickle.spec.in
 
 bin_PROGRAMS = nickle
 
@@ -81,4 +82,14 @@
 	cp -a $(distdir) $(distdir).orig
 	rm -rf $(distdir).orig/debian
 
-.PHONY: debuild debuild-signed debuild-unsigned debuild-dirs
+#
+# This assumes you've got Mike Harris's rpmbuild-nonroot stuff installed
+# using the defaults
+#
+rpm: dist-gzip
+	mkdir -p $(HOME)/rpmbuild/$(PACKAGE)-$(VERSION)
+	cp $(PACKAGE)-$(VERSION).tar.gz $(HOME)/rpmbuild/$(PACKAGE)-$(VERSION)
+	rpm -ba nickle.spec
+
+.PHONY: debuild debuild-signed debuild-unsigned debuild-dirs rpm
+

Index: build-rpm
===================================================================
RCS file: /local/src/CVS/nickle/build-rpm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/build-rpm	27 Oct 2001 17:10:41 -0000	1.5
+++ b/build-rpm	1 Apr 2004 19:49:56 -0000	1.6
@@ -1,15 +1,14 @@
 #!/bin/sh
-VERSION=`egrep AM_INIT_AUTOMAKE configure.in | sed -e 's/^.*,//' -e 's/).*$//'`
+VERSION=`egrep BUILD_VERSION version.h | sed -e 's/^[^"]*"//' -e 's/".*$//'`
 echo "Building nickle $VERSION RPM..." >&2
-cvs -r export -D now -d nickle-$VERSION nickle
-(cd nickle-$VERSION && sh ./autoconfigure.sh)
-chmod +w nickle-$VERSION/nickle.spec
-ed nickle-$VERSION/nickle.spec << EOF
-g/VERSION/s/VERSION/$VERSION/
+RPMBUILD=$HOME/rpmbuild
+echo mkdir -p $RPMBUILD/nickle-$VERSION
+make nickle-$VERSION.tar.gz
+cp nickle-$VERSION.tar.gz $RPMBUILD/nickle-$VERSION
+cp nickle.spec nickle-$VERSION.spec
+ed nickle-$VERSION.spec << EOF
+/VERSION/s//$VERSION/
 w
 q
 EOF
-chmod -w nickle-$VERSION/nickle.spec
-tar cf - nickle-$VERSION | bzip2 > nickle-$VERSION.tar.bz2
-rm -rf nickle-$VERSION
-rpm -ta --clean nickle-$VERSION.tar.bz2
+rpm -ba nickle-$VERSION.spec

Index: configure.in
===================================================================
RCS file: /local/src/CVS/nickle/configure.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- a/configure.in	27 Feb 2004 03:50:15 -0000	1.29
+++ b/configure.in	1 Apr 2004 19:49:56 -0000	1.30
@@ -89,6 +89,7 @@
  test/Makefile
  bench/Makefile
  date-sh
- nickle.1)
+ nickle.1
+ nickle.spec)
 
 AC_OUTPUT

Index: version.m4
===================================================================
RCS file: /local/src/CVS/nickle/version.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/version.m4	27 Feb 2004 05:13:46 -0000	1.8
+++ b/version.m4	1 Apr 2004 19:49:56 -0000	1.9
@@ -1,7 +1,7 @@
 dnl This file is maintained automatically by update-version.sh
 dnl The file format is finicky, so do not hand-edit lightly.
-dnl Last updated Thu Feb 26 21:12:34 PST 2004
+dnl Last updated Thu Apr  1 09:31:57 PST 2004
 dnl CURHEADER $Header$
-dnl OLDHEADER <Header: /local/src/CVS/nickle/version.m4,v 1.7 2004/01/17 15:32:15 keithp Exp >
-dnl CURVERSION 2.28
-define([VERSION_NUMBER],[2.28])
+dnl OLDHEADER <Header: /local/src/CVS/nickle/version.m4,v 1.8 2004/02/27 05:13:46 bart Exp >
+dnl CURVERSION 2.29
+define([VERSION_NUMBER],[2.29])

--- nickle.spec DELETED ---

More information about the Commit mailing list