diff --git a/Makefile b/Makefile index 4fe3c62..d498826 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CC ?= cc CFLAGS ?= -Wall -O2 -ggdb -OPTFLAGS = -DREV=$(shell ./getrev.sh) +OPTFLAGS = -DREVISION=\"$(shell svnversion | awk 'BEGIN { RS=":" } { next } END { print $$1 }')\" # Comment on non-gnu systems OPTFLAGS += -DHAVE_GETOPT_LONG diff --git a/cmdline.c b/cmdline.c index 1708bee..c8fc890 100644 --- a/cmdline.c +++ b/cmdline.c @@ -38,7 +38,7 @@ extern char * optarg; static char *getCredentialsFromFile( const char* filename, char **user, char **pass, char **rem_user, char **rem_pass); void cmdline_parser_print_version (void) { - printf ("%s %s (rev %d) Copyright 2001-2008 Proxytunnel Project\n", PACKAGE, VERSION, REV); + printf ("%s %s (rev %s) Copyright 2001-2008 Proxytunnel Project\n", PACKAGE, VERSION, REVISION); } void cmdline_parser_print_help (void) { diff --git a/contrib/proxytunnel.spec b/contrib/proxytunnel.spec index d2eee52..9d4fd19 100644 --- a/contrib/proxytunnel.spec +++ b/contrib/proxytunnel.spec @@ -2,9 +2,9 @@ # Authority: dag # Upstream: -Summary: Punching holes in HTTP(S) proxy's +Summary: Punching holes through HTTPS proxies Name: proxytunnel -Version: 1.8.0 +Version: 1.9.0 Release: 1 License: GPL Group: Applications/Internet @@ -47,7 +47,7 @@ proxy authentication. %files %defattr(-, root, root, 0755) -%doc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README TODO +%doc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README REL_NOTES TODO docs/*.txt docs/*.html %doc %{_mandir}/man1/proxytunnel.1* %{_bindir}/proxytunnel diff --git a/getrev.sh b/getrev.sh deleted file mode 100755 index 9a1feaa..0000000 --- a/getrev.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -REV=`svn info . 2> /dev/null | grep '^Revision' | awk '{print $2}'` -if [ "x$REV" = "x" ] ; then - echo "0" -else - echo $REV -fi -exit 0;