Added way to put SVN revision in package.
git-svn-id: http://voip.null.ro/svn/yate@2214 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
27c11e6afe
commit
bbf64c9a1c
|
@ -254,8 +254,8 @@ uninstall uninstall-root:
|
||||||
|
|
||||||
install-root uninstall-root: LDCONFIG:=ldconfig
|
install-root uninstall-root: LDCONFIG:=ldconfig
|
||||||
|
|
||||||
.PHONY: snapshot tarball rpm srpm
|
.PHONY: snapshot tarball rpm srpm revision
|
||||||
snapshot tarball: check-topdir clean tables windows apidocs
|
snapshot tarball: check-topdir revision clean tables windows apidocs
|
||||||
@if [ $@ = snapshot ]; then ver="`date '+SVN-%Y%m%d'`"; else ver="@PACKAGE_VERSION@-@PACKAGE_STATUS@@PACKAGE_RELEASE@"; fi ; \
|
@if [ $@ = snapshot ]; then ver="`date '+SVN-%Y%m%d'`"; else ver="@PACKAGE_VERSION@-@PACKAGE_STATUS@@PACKAGE_RELEASE@"; fi ; \
|
||||||
wd=`pwd|sed 's,^.*/,,'`; \
|
wd=`pwd|sed 's,^.*/,,'`; \
|
||||||
mkdir -p packing/tarballs; cd ..; \
|
mkdir -p packing/tarballs; cd ..; \
|
||||||
|
@ -292,6 +292,10 @@ rpm: check-root tarball
|
||||||
srpm: check-root tarball
|
srpm: check-root tarball
|
||||||
rpmbuild -ta packing/tarballs/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-@PACKAGE_STATUS@@PACKAGE_RELEASE@.tar.gz
|
rpmbuild -ta packing/tarballs/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-@PACKAGE_STATUS@@PACKAGE_RELEASE@.tar.gz
|
||||||
|
|
||||||
|
revision: check-topdir
|
||||||
|
@-rev=`svn info 2>/dev/null | sed -n 's,^Revision: *,,p'`; \
|
||||||
|
test -z "$$rev" || echo "$$rev" > packing/revision.txt
|
||||||
|
|
||||||
%.o: @srcdir@/%.cpp $(MKDEPS) @srcdir@/yatengine.h
|
%.o: @srcdir@/%.cpp $(MKDEPS) @srcdir@/yatengine.h
|
||||||
$(COMPILE) -c $<
|
$(COMPILE) -c $<
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ AC_PREREQ(2.52)
|
||||||
|
|
||||||
PACKAGE_RELEASE="1"
|
PACKAGE_RELEASE="1"
|
||||||
PACKAGE_STATUS=""
|
PACKAGE_STATUS=""
|
||||||
|
PACKAGE_REVISION=`cat packing/revision.txt 2>/dev/null`
|
||||||
|
|
||||||
PACKAGE_VERSION_MAJOR="${PACKAGE_VERSION%%.*}"
|
PACKAGE_VERSION_MAJOR="${PACKAGE_VERSION%%.*}"
|
||||||
PACKAGE_VERSION_MINOR="${PACKAGE_VERSION#*.}"
|
PACKAGE_VERSION_MINOR="${PACKAGE_VERSION#*.}"
|
||||||
|
@ -17,6 +18,7 @@ AC_SUBST(PACKAGE_VERSION_BUILD)
|
||||||
AC_SUBST(PACKAGE_VERSION_RELEASE)
|
AC_SUBST(PACKAGE_VERSION_RELEASE)
|
||||||
AC_SUBST(PACKAGE_RELEASE)
|
AC_SUBST(PACKAGE_RELEASE)
|
||||||
AC_SUBST(PACKAGE_STATUS)
|
AC_SUBST(PACKAGE_STATUS)
|
||||||
|
AC_SUBST(PACKAGE_REVISION)
|
||||||
|
|
||||||
# sed expression to convert version into something comparable lexicographically
|
# sed expression to convert version into something comparable lexicographically
|
||||||
vsed='s/\(^\|\.\)\([[0-9]]\)\($\|\.\)/\10\2\3/g'
|
vsed='s/\(^\|\.\)\([[0-9]]\)\($\|\.\)/\10\2\3/g'
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
# to add a distro release tag run rpmbuild --define 'dist value'
|
# to add a distro release tag run rpmbuild --define 'dist value'
|
||||||
|
# to add a revision tag run rpmbuild --define 'revision value'
|
||||||
# to suppress auto dependencies run rpmbuild --define 'nodeps 1'
|
# to suppress auto dependencies run rpmbuild --define 'nodeps 1'
|
||||||
# to disable PSTN card drivers run rpmbuild --define 'nopstn 1'
|
# to disable PSTN card drivers run rpmbuild --define 'nopstn 1'
|
||||||
# to disable H.323 support run rpmbuild --define 'noh323 1'
|
# to disable H.323 support run rpmbuild --define 'noh323 1'
|
||||||
|
@ -10,6 +11,10 @@
|
||||||
%{?noh323:%define no_h323 1}
|
%{?noh323:%define no_h323 1}
|
||||||
%{?nogui:%define no_gui 1}
|
%{?nogui:%define no_gui 1}
|
||||||
|
|
||||||
|
%if "%{revision}" == "svn"
|
||||||
|
%define revision svn@PACKAGE_REVISION@-
|
||||||
|
%endif
|
||||||
|
|
||||||
%if "%{dist}" == ""
|
%if "%{dist}" == ""
|
||||||
%define dist %(test -f /etc/mandriva-release && echo mdv)
|
%define dist %(test -f /etc/mandriva-release && echo mdv)
|
||||||
%endif
|
%endif
|
||||||
|
@ -35,7 +40,7 @@
|
||||||
Summary: Yet Another Telephony Engine
|
Summary: Yet Another Telephony Engine
|
||||||
Name: @PACKAGE_TARNAME@
|
Name: @PACKAGE_TARNAME@
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
Release: @PACKAGE_STATUS@@PACKAGE_RELEASE@%{dist}
|
Release: %{revision}@PACKAGE_STATUS@@PACKAGE_RELEASE@%{dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
Packager: Paul Chitescu <paulc@voip.null.ro>
|
Packager: Paul Chitescu <paulc@voip.null.ro>
|
||||||
Source: http://yate.null.ro/%{name}-%{version}-@PACKAGE_STATUS@@PACKAGE_RELEASE@.tar.gz
|
Source: http://yate.null.ro/%{name}-%{version}-@PACKAGE_STATUS@@PACKAGE_RELEASE@.tar.gz
|
||||||
|
|
Loading…
Reference in New Issue