drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Release calc version 2.12.4.7

Browse Source
This commit is contained in:
Landon Curt Noll
2013-05-05 06:40:28 -07:00
parent 5bada5fefd
commit 5e6b3cbd3f
9 changed files with 84 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGES
View File

@@ -2,9 +2,14 @@ The following are the changes from calc version 2.12.4.6 to date:
Updated RPM build process to remove use of deprecated flags. Updated RPM build process to remove use of deprecated flags.
Applied a number of fixes calc.spec file. Applied a number of fixes to calc.spec and rpm.mk file.
See calc.spec.in for details. Changed rpm release to 2.1.
Changed rpm release to 2.1. Set MACOSX_DEPLOYMENT_TARGET=10.8 as we upgraded all of
our development Mac OS X to 10.8.
Libraries are chmodded as 0644 to allow for building rpms
without root.
The following are the changes from calc version 2.12.4.3 to 2.12.4.5: The following are the changes from calc version 2.12.4.3 to 2.12.4.5:
@@ -6826,8 +6831,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
## received a copy with calc; if not, write to Free Software Foundation, Inc. ## received a copy with calc; if not, write to Free Software Foundation, Inc.
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
## ##
## @(#) $Revision: 30.24 $ ## @(#) $Revision: 30.25 $
## @(#) $Id: CHANGES,v 30.24 2013/05/05 08:31:08 chongo Exp $ ## @(#) $Id: CHANGES,v 30.25 2013/05/05 10:15:30 chongo Exp $
## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $ ## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $
## ##
## Under source code control: 1993/06/02 18:12:57 ## Under source code control: 1993/06/02 18:12:57

6
Makefile
View File

@@ -39,8 +39,8 @@
# received a copy with calc; if not, write to Free Software Foundation, Inc. # received a copy with calc; if not, write to Free Software Foundation, Inc.
# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
# #
MAKEFILE_REV= $$Revision: 30.49 $$ MAKEFILE_REV= $$Revision: 30.50 $$
# @(#) $Id: Makefile.ship,v 30.49 2013/03/25 21:31:55 chongo Exp chongo $ # @(#) $Id: Makefile.ship,v 30.50 2013/05/05 10:21:52 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
# #
# Under source code control: 1990/02/15 01:48:41 # Under source code control: 1990/02/15 01:48:41
@@ -997,7 +997,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.4.6 VERSION= 2.12.4.7
VERS= 2.12.4 VERS= 2.12.4
VER= 2.12 VER= 2.12
VE= 2 VE= 2

6
Makefile.simple
View File

@@ -39,8 +39,8 @@
# received a copy with calc; if not, write to Free Software Foundation, Inc. # received a copy with calc; if not, write to Free Software Foundation, Inc.
# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
# #
MAKEFILE_REV= $$Revision: 30.49 $$ MAKEFILE_REV= $$Revision: 30.50 $$
# @(#) $Id: Makefile.ship,v 30.49 2013/03/25 21:31:55 chongo Exp chongo $ # @(#) $Id: Makefile.ship,v 30.50 2013/05/05 10:21:52 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
# #
# Under source code control: 1990/02/15 01:48:41 # Under source code control: 1990/02/15 01:48:41
@@ -974,7 +974,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.4.6 VERSION= 2.12.4.7
VERS= 2.12.4 VERS= 2.12.4
VER= 2.12 VER= 2.12
VE= 2 VE= 2

20
calc.spec.in
View File

@@ -18,8 +18,8 @@
# received a copy with calc; if not, write to Free Software Foundation, Inc. # received a copy with calc; if not, write to Free Software Foundation, Inc.
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
# @(#) $Revision: 30.8 $ # @(#) $Revision: 30.10 $
# @(#) $Id: calc.spec.in,v 30.8 2013/05/01 16:23:39 chongo Exp chongo $ # @(#) $Id: calc.spec.in,v 30.10 2013/05/05 11:57:44 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc/RCS/calc.spec.in,v $ # @(#) $Source: /usr/local/src/bin/calc/RCS/calc.spec.in,v $
# #
# Under source code control: 2003/02/16 20:21:39 # Under source code control: 2003/02/16 20:21:39
@@ -37,7 +37,7 @@
Summary: Arbitrary precision calculator. Summary: Arbitrary precision calculator.
Name: calc Name: calc
Version: <<<PROJECT_VERSION>>> Version: <<<PROJECT_VERSION>>>
Release: 2.1 Release: 10
License: LGPL License: LGPL
Group: Applications/Engineering Group: Applications/Engineering
Source: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2 Source: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
@@ -141,36 +141,48 @@ rm -rf %{_buildroot}
%changelog %changelog
* Sat May 05 2013 Landon Curt Noll http://www.isthe.com/chongo * Sat May 05 2013 Landon Curt Noll http://www.isthe.com/chongo
- Release: 10
- Major bug rpm build process bug fix
- Source: is a URL as per rpm requirements - Source: is a URL as per rpm requirements
- Release: 2.1
- Requires: ncurses >= 5.5-24, readline >= 5.1-3, less >= 358 - Requires: ncurses >= 5.5-24, readline >= 5.1-3, less >= 358
- BuildRequires: ncurses-devel >= 5.5-24, readline-devel >= 5.1-3 - BuildRequires: ncurses-devel >= 5.5-24, readline-devel >= 5.1-3
- BuildRoot: %{_tmppath}/build-root
- Fixed use of %{_buildroot}
- Fixed permissions so that rpm build services can modify libraries - Fixed permissions so that rpm build services can modify libraries
- Added missing files to files section - Added missing files to files section
* Mon Mar 25 2013 Landon Curt Noll http://www.isthe.com/chongo * Mon Mar 25 2013 Landon Curt Noll http://www.isthe.com/chongo
- Release: 9 (was 1.1)
- Removed deprecated PreReq for calc-devel, using Requires - Removed deprecated PreReq for calc-devel, using Requires
* Sun Sep 01 2007 Landon Curt Noll http://www.isthe.com/chongo * Sun Sep 01 2007 Landon Curt Noll http://www.isthe.com/chongo
- Release: 8
- Release of calc-2.12.2 - Release of calc-2.12.2
- Calc builds with shared libraries - Calc builds with shared libraries
* Sun Jun 25 2006 Landon Curt Noll http://www.isthe.com/chongo * Sun Jun 25 2006 Landon Curt Noll http://www.isthe.com/chongo
- Release: 7
- Changed Copyright to License as per new rpm v4.4 syntax - Changed Copyright to License as per new rpm v4.4 syntax
* Sun May 20 2006 Landon Curt Noll http://www.isthe.com/chongo * Sun May 20 2006 Landon Curt Noll http://www.isthe.com/chongo
- Release: 6
- Release of calc-2.12.0 - Release of calc-2.12.0
- Added *.line set files to the list of packaged files - Added *.line set files to the list of packaged files
* Sun Dec 11 2005 Landon Curt Noll http://www.isthe.com/chongo * Sun Dec 11 2005 Landon Curt Noll http://www.isthe.com/chongo
- Release: 5
- Release of calc-2.11.11 - Release of calc-2.11.11
- Fixed description in spec file - Fixed description in spec file
* Wed Feb 26 2003 Landon Curt Noll http://www.isthe.com/chongo * Wed Feb 26 2003 Landon Curt Noll http://www.isthe.com/chongo
- Release: 4
- Release of calc-2.11.7-2 - Release of calc-2.11.7-2
- Fixed attributes on include and lib calc-devel files - Fixed attributes on include and lib calc-devel files
- Added BUGS to calc-devel as well as calc - Added BUGS to calc-devel as well as calc
* Tue Feb 25 2003 Landon Curt Noll http://www.isthe.com/chongo * Tue Feb 25 2003 Landon Curt Noll http://www.isthe.com/chongo
- Release: 3
- Release of calc-2.11.7-1 - Release of calc-2.11.7-1
- Require ncurses, readline and less to install. - Require ncurses, readline and less to install.
- Require ncurses-devel and readline-devel to build. - Require ncurses-devel and readline-devel to build.
* Tue Feb 18 2003 Landon Curt Noll http://www.isthe.com/chongo * Tue Feb 18 2003 Landon Curt Noll http://www.isthe.com/chongo
- Release: 2
- Misc changes to fit local directory setup - Misc changes to fit local directory setup
* Sun Feb 16 2003 Petteri Kettunen <petterik@users.sourceforge.net> * Sun Feb 16 2003 Petteri Kettunen <petterik@users.sourceforge.net>
- Release: 1
- initial RPM build - initial RPM build
#**** #****

6
custom/Makefile
View File

@@ -18,8 +18,8 @@
# received a copy with calc; if not, write to Free Software Foundation, Inc. # received a copy with calc; if not, write to Free Software Foundation, Inc.
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
# @(#) $Revision: 30.24 $ # @(#) $Revision: 30.25 $
# @(#) $Id: Makefile.head,v 30.24 2013/03/25 21:31:56 chongo Exp $ # @(#) $Id: Makefile.head,v 30.25 2013/05/05 10:21:52 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $
# #
# Under source code control: 1997/03/09 02:28:54 # Under source code control: 1997/03/09 02:28:54
@@ -366,7 +366,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.4.6 VERSION= 2.12.4.7
VERS= 2.12.4 VERS= 2.12.4
VER= 2.12 VER= 2.12
VE= 2 VE= 2

6
custom/Makefile.head
View File

@@ -18,8 +18,8 @@
# received a copy with calc; if not, write to Free Software Foundation, Inc. # received a copy with calc; if not, write to Free Software Foundation, Inc.
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
# @(#) $Revision: 30.24 $ # @(#) $Revision: 30.25 $
# @(#) $Id: Makefile.head,v 30.24 2013/03/25 21:31:56 chongo Exp $ # @(#) $Id: Makefile.head,v 30.25 2013/05/05 10:21:52 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $
# #
# Under source code control: 1997/03/09 02:28:54 # Under source code control: 1997/03/09 02:28:54
@@ -366,7 +366,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.4.6 VERSION= 2.12.4.7
VERS= 2.12.4 VERS= 2.12.4
VER= 2.12 VER= 2.12
VE= 2 VE= 2

6
custom/Makefile.simple
View File

@@ -18,8 +18,8 @@
# received a copy with calc; if not, write to Free Software Foundation, Inc. # received a copy with calc; if not, write to Free Software Foundation, Inc.
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
# @(#) $Revision: 30.24 $ # @(#) $Revision: 30.25 $
# @(#) $Id: Makefile.head,v 30.24 2013/03/25 21:31:56 chongo Exp $ # @(#) $Id: Makefile.head,v 30.25 2013/05/05 10:21:52 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $
# #
# Under source code control: 1997/03/09 02:28:54 # Under source code control: 1997/03/09 02:28:54
@@ -351,7 +351,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.4.6 VERSION= 2.12.4.7
VERS= 2.12.4 VERS= 2.12.4
VER= 2.12 VER= 2.12
VE= 2 VE= 2

71
rpm.mk
View File

@@ -19,8 +19,8 @@
# received a copy with calc; if not, write to Free Software Foundation, Inc. # received a copy with calc; if not, write to Free Software Foundation, Inc.
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# #
MAKEFILE_REV= $$Revision: 30.7 $$ MAKEFILE_REV= $$Revision: 30.10 $$
# @(#) $Id: rpm.mk,v 30.7 2013/05/02 01:00:12 chongo Exp chongo $ # @(#) $Id: rpm.mk,v 30.10 2013/05/05 11:59:51 chongo Exp $
# @(#) $Source: /usr/local/src/bin/calc/RCS/rpm.mk,v $ # @(#) $Source: /usr/local/src/bin/calc/RCS/rpm.mk,v $
# #
# Under source code control: 2003/02/16 20:21:39 # Under source code control: 2003/02/16 20:21:39
@@ -32,6 +32,37 @@ MAKEFILE_REV= $$Revision: 30.7 $$
# calculator by David I. Bell with help/mods from others # calculator by David I. Bell with help/mods from others
# Makefile by Petteri Kettunen with modifications from Landon Curt Noll # Makefile by Petteri Kettunen with modifications from Landon Curt Noll
# IMPORTANT NOTE: The rpm process assumes that ~/.rpmmacros contains the following:
#
# %_signature gpg
# %_gpg_path ~/.gnupg
# %_gpg_name __YOUR_NAME_HERE__
# %_gpgbin /usr/bin/gpg
# %_topdir %(echo $HOME)/rpm/%{name}
# %_sourcedir %(echo $HOME)/rpm/%{name}/SOURCES
# %_specdir %(echo $HOME)/rpm/%{name}/SPECS
# %_tmppath %(echo $HOME)/rpm/%{name}/tmp
# %_builddir %(echo $HOME)/rpm/%{name}/BUILD
# %_buildroot %(echo $HOME)/rpm/%{name}/tmp/build-root
# %_rpmdir %(echo $HOME)/rpm/%{name}/RPMS
# %_srcrpmdir %(echo $HOME)/rpm/%{name}/SRPMS
# %_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
# %packager __YOUR_NAME_HERE__
# %vendor __YOUR_ORG_OR_GROUP_OR_COMPANY_HERE__
# IMPORTANT NOTE: Unless the package redhat-rpm-config is installed,
# the calc-debuginfo rpm will not be created.
#
# IMPORTANT NOTE: These packages are important for general
# rpm processing:
#
# rpm
# rpm-python
# rpmlint
# rpm-build
# rpm-libs
# redhat-rpm-config
# setup # setup
# #
SHELL= /bin/sh SHELL= /bin/sh
@@ -39,8 +70,6 @@ RPMBUILD_TOOL= rpmbuild
TARCH= i686 TARCH= i686
RPMBUILD_OPTION= -ba --target=$(TARCH) RPMBUILD_OPTION= -ba --target=$(TARCH)
RPM_TOOL= rpm RPM_TOOL= rpm
MD5SUM= md5sum
SHA1SUM= sha1sum
SED= sed SED= sed
FIND= find FIND= find
BZIP2_PROG= bzip2 BZIP2_PROG= bzip2
@@ -59,16 +88,16 @@ LN= ln
# rpm-related parameters # rpm-related parameters
# #
NAME= calc NAME= calc
PROJECT_NAME= $(NAME) PROJECT_NAME= ${NAME}
PROJECT_VERSION= PROJECT_VERSION=
PROJECT_RELEASE= PROJECT_RELEASE=
PROJECT= $(PROJECT_NAME)-$(PROJECT_VERSION) PROJECT= ${PROJECT_NAME}-${PROJECT_VERSION}
SPECFILE= $(PROJECT_NAME).spec SPECFILE= ${PROJECT_NAME}.spec
TARBALL= $(PROJECT).${TAR}.bz2 TARBALL= ${PROJECT}.${TAR}.bz2
RPM686= $(PROJECT)-$(PROJECT_RELEASE).$(TARCH).rpm RPM686= ${PROJECT}-${PROJECT_RELEASE}.${TARCH}.rpm
DRPM686= $(PROJECT_NAME)-devel-$(PROJECT_VERSION)-$(PROJECT_RELEASE).$(TARCH).rpm DRPM686= ${PROJECT_NAME}-devel-${PROJECT_VERSION}-${PROJECT_RELEASE}.${TARCH}.rpm
SRPM= $(PROJECT)-$(PROJECT_RELEASE).src.rpm SRPM= ${PROJECT}-${PROJECT_RELEASE}.src.rpm
RPM_TOP= /usr/local/rpm/${NAME} RPM_TOP= ${HOME}/rpm/${NAME}
TMPDIR= ${RPM_TOP}/tmp TMPDIR= ${RPM_TOP}/tmp
# Makefile debug # Makefile debug
@@ -153,24 +182,6 @@ rpm: srcpkg calc.spec
exit 3; \ exit 3; \
fi fi
@echo @echo
@echo "RPM package sizes:"
@echo
@cd $(RPM_TOP); ${LS} -1s "RPMS/$(RPM686)" "RPMS/$(DRPM686)" "SRPMS/$(SRPM)"
@echo
@echo "RPM package md5 hashes:"
@echo
-@cd $(RPM_TOP); ${MD5SUM} "RPMS/$(RPM686)" "RPMS/$(DRPM686)" "SRPMS/$(SRPM)"
@echo
@echo "RPM package sha1 hashes:"
@echo
-@cd $(RPM_TOP); ${SHA1SUM} "RPMS/$(RPM686)" "RPMS/$(DRPM686)" "SRPMS/$(SRPM)"
@echo
@echo "RPM package locations:"
@echo
@${LS} -1 "$(RPM_TOP)/RPMS/$(RPM686)" "$(RPM_TOP)/RPMS/$(DRPM686)" "$(RPM_TOP)/SRPMS/$(SRPM)"
@echo
@echo "All done! -- Jessica Noll, Age 2"
@echo
${V} echo '=-=-=-=-= rpm.mk end of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= rpm.mk end of $@ rule =-=-=-=-='
.PHONY: make_rhdir .PHONY: make_rhdir

6
version.c
View File

@@ -19,8 +19,8 @@
* received a copy with calc; if not, write to Free Software Foundation, Inc. * received a copy with calc; if not, write to Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* *
* @(#) $Revision: 30.15 $ * @(#) $Revision: 30.16 $
* @(#) $Id: version.c,v 30.15 2013/03/25 21:30:44 chongo Exp $ * @(#) $Id: version.c,v 30.16 2013/05/05 10:16:02 chongo Exp $
* @(#) $Source: /usr/local/src/bin/calc/RCS/version.c,v $ * @(#) $Source: /usr/local/src/bin/calc/RCS/version.c,v $
* *
* Under source code control: 1990/05/22 11:00:58 * Under source code control: 1990/05/22 11:00:58
@@ -49,7 +49,7 @@ static char *program;
#define MAJOR_VER 2 /* major library version */ #define MAJOR_VER 2 /* major library version */
#define MINOR_VER 12 /* minor library version */ #define MINOR_VER 12 /* minor library version */
#define MAJOR_PATCH 4 /* major software level under library version */ #define MAJOR_PATCH 4 /* major software level under library version */
#define MINOR_PATCH 6 /* minor software level or 0 if not patched */ #define MINOR_PATCH 7 /* minor software level or 0 if not patched */
/* /*