From c28e4d627fd7c17d02bf053c9599f556f0e14459 Mon Sep 17 00:00:00 2001 From: paulc Date: Tue, 4 Jul 2006 19:11:58 +0000 Subject: [PATCH] Bumped version no, preparing for release. git-svn-id: http://voip.null.ro/svn/yate@929 acf43c95-373e-0410-b603-e72c3f656dc1 --- Makefile.in | 11 +++++++++-- configure.in | 7 +++++-- windows/yateversn.h | 18 +++++++++--------- yate.spec.in | 13 ++++++++++--- yateversn.h.in | 6 +++--- 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/Makefile.in b/Makefile.in index 34b7e62d..588d9433 100644 --- a/Makefile.in +++ b/Makefile.in @@ -89,6 +89,9 @@ clean: check-topdir: @test -f configure || (echo "Must make this target in the top source directory"; exit 1) +check-root: + @test `id -u` = '0' || (echo "You must run this command as root"; exit 1) + clean-config-files: check-topdir -rm -rf auto*.cache -rm -f @CONFIGURE_FILES@ @@ -160,6 +163,7 @@ yatepaths.h: $(MKDEPS) windows: check-topdir @cmp -s yateversn.h $@/yateversn.h || cp -p yateversn.h $@/yateversn.h + @cmp -s yateiss.inc $@/yateiss.inc || cp -p yateiss.inc $@/yateiss.inc .PHONY: install install-root install-noapi install-api uninstall uninstall-root install install-root: all apidocs install-noapi install-api @@ -229,7 +233,7 @@ uninstall uninstall-root: install-root uninstall-root: LDCONFIG:=ldconfig -.PHONY: snapshot tarball +.PHONY: snapshot tarball rpm snapshot tarball: check-topdir clean tables windows apidocs @if [ $@ = snapshot ]; then ver="`date '+CVS-%Y%m%d'`"; else ver="@PACKAGE_VERSION@@PACKAGE_RELEASE@"; fi ; \ wd=`pwd|sed 's,^.*/,,'`; \ @@ -260,6 +264,9 @@ snapshot tarball: check-topdir clean tables windows apidocs $$wd; \ rm $$wd/tar-exclude +rpm: check-root tarball + rpmbuild -tb tarballs/yate-@PACKAGE_VERSION@@PACKAGE_RELEASE@.tar.gz + %.o: @srcdir@/%.cpp $(MKDEPS) @srcdir@/yatengine.h $(COMPILE) -c $< @@ -289,4 +296,4 @@ help: install uninstall install-noapi install-root uninstall-root\n\ clean distclean cvsclean (avoid this one!) clean-apidocs\n\ debug ddebug xdebug (carefull!)\n\ - snapshot tarball' + snapshot tarball rpm' diff --git a/configure.in b/configure.in index 345f16f2..f62dda16 100644 --- a/configure.in +++ b/configure.in @@ -1,17 +1,19 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(YATE, 0.9.0) +AC_INIT(Yate, 1.0.0) AC_CONFIG_SRCDIR([README]) AC_PREREQ(2.52) -PACKAGE_RELEASE="pre4" +PACKAGE_RELEASE="pre1" PACKAGE_VERSION_MAJOR="${PACKAGE_VERSION%%.*}" PACKAGE_VERSION_MINOR="${PACKAGE_VERSION#*.}" PACKAGE_VERSION_MINOR="${PACKAGE_VERSION_MINOR%.*}" PACKAGE_VERSION_BUILD="${PACKAGE_VERSION##*.}" +PACKAGE_VERSION_RELEASE="$((0+${PACKAGE_RELEASE}))" AC_SUBST(PACKAGE_VERSION_MAJOR) AC_SUBST(PACKAGE_VERSION_MINOR) AC_SUBST(PACKAGE_VERSION_BUILD) +AC_SUBST(PACKAGE_VERSION_RELEASE) AC_SUBST(PACKAGE_RELEASE) # Checks for programs. @@ -662,6 +664,7 @@ AC_SUBST(KDOC_BIN) AC_CONFIG_FILES([yate.spec yate.pc yateversn.h + yateiss.inc Makefile engine/Makefile modules/Makefile diff --git a/windows/yateversn.h b/windows/yateversn.h index 92ff6617..a53659d4 100644 --- a/windows/yateversn.h +++ b/windows/yateversn.h @@ -1,4 +1,4 @@ -/** +/* * yateversn.h * This file is part of the YATE Project http://YATE.null.ro * @@ -10,19 +10,19 @@ #define __YATEVERSN_H /* Version numbers */ -#define YATE_MAJOR 0 -#define YATE_MINOR 9 +#define YATE_MAJOR 1 +#define YATE_MINOR 0 #define YATE_BUILD 0 /* Version strings */ -#define YATE_MAJOR_S "0" -#define YATE_MINOR_S "9" +#define YATE_MAJOR_S "1" +#define YATE_MINOR_S "0" #define YATE_BUILD_S "0" -#define YATE_VERSION "0.9.0" -#define YATE_RELEASE "pre4" +#define YATE_VERSION "1.0.0" +#define YATE_RELEASE "pre1" /* Windows version resource - file and string style */ -#define YATE_WINVER_F 0,9,0,0 -#define YATE_WINVER_S "0, 9, 0\0" +#define YATE_WINVER_F 1,0,0,0 +#define YATE_WINVER_S "1, 0, 0, 0\0" #endif /* __YATEVERSN_H */ diff --git a/yate.spec.in b/yate.spec.in index 8051c072..2aedbb85 100644 --- a/yate.spec.in +++ b/yate.spec.in @@ -1,10 +1,13 @@ +# to add a distro release tag run rpmbuild --define 'dist value' +#%{!?dist:%define dist %{nil}} + Summary: Yet Another Telephony Engine -Name: yate +Name: @PACKAGE_TARNAME@ Version: @PACKAGE_VERSION@ -Release: @PACKAGE_RELEASE@ +Release: @PACKAGE_RELEASE@%{dist} License: GPL Packager: Paul Chitescu -Source: http://yate.null.ro/%{name}-%{version}%{release}.tar.gz +Source: http://yate.null.ro/%{name}-%{version}@PACKAGE_RELEASE@.tar.gz Group: Applications/Communications BuildRoot: %{_tmppath}/%{name}-%{version}%{release}-root URL: http://yate.null.ro/ @@ -129,6 +132,10 @@ cp -p %{_builddir}/%{name}/yate.init %{buildroot}/etc/rc.d/init.d/yate rm -rf %{buildroot} %changelog +* Tue Jul 04 2006 Paul Chitescu +- Version 1.0.0-pre1 +- Capability to add a distro release tag at rpmbuild time + * Fri Jun 16 2006 Paul Chitescu - Added .desktop and .menu files and update-menus scriptlets diff --git a/yateversn.h.in b/yateversn.h.in index 07d7e9ff..622cf392 100644 --- a/yateversn.h.in +++ b/yateversn.h.in @@ -1,4 +1,4 @@ -/** +/* * yateversn.h * This file is part of the YATE Project http://YATE.null.ro * @@ -22,7 +22,7 @@ #define YATE_RELEASE "@PACKAGE_RELEASE@" /* Windows version resource - file and string style */ -#define YATE_WINVER_F @PACKAGE_VERSION_MAJOR@,@PACKAGE_VERSION_MINOR@,@PACKAGE_VERSION_BUILD@,0 -#define YATE_WINVER_S "@PACKAGE_VERSION_MAJOR@, @PACKAGE_VERSION_MINOR@, @PACKAGE_VERSION_BUILD@\0" +#define YATE_WINVER_F @PACKAGE_VERSION_MAJOR@,@PACKAGE_VERSION_MINOR@,@PACKAGE_VERSION_BUILD@,@PACKAGE_VERSION_RELEASE@ +#define YATE_WINVER_S "@PACKAGE_VERSION_MAJOR@, @PACKAGE_VERSION_MINOR@, @PACKAGE_VERSION_BUILD@, @PACKAGE_VERSION_RELEASE@\0" #endif /* __YATEVERSN_H */