From 61c32a7ae84ef0d20204cafaf028486bbd576f6b Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Wed, 28 Mar 2012 12:50:37 +0000
Subject: [PATCH] Atualizando identificacao de revisao/versao

---
 Makefile.in     |  1 +
 bootstrap.sh    | 38 ++++++++++++++++++++++++++++++++++++++
 configure.ac    | 10 +++++++---
 get_versions.sh | 25 -------------------------
 pw3270.spec.in  |  5 ++---
 5 files changed, 48 insertions(+), 31 deletions(-)
 create mode 100755 bootstrap.sh
 delete mode 100755 get_versions.sh

diff --git a/Makefile.in b/Makefile.in
index 8928137..e42ba41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,6 +100,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean
 	@rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+	@./bootstrap.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp configure.ac $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp configure $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@cp *.in $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 0000000..08d1af3
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+if test -z $1; then
+	out=`dirname $0`
+else
+	out="$1"
+fi
+
+if test -e revision ; then
+	. revision
+fi
+
+PACKAGE_REVISION=`date +%y%m%d`
+
+if test -d ".svn" ; then
+
+	SVN=`which svn 2> /dev/null`
+
+	if test -x "$SVN" ; then
+
+		TEMPFILE=$(mktemp)
+		LANG="EN_US"
+		$SVN info > $TEMPFILE 2> /dev/null
+		PACKAGE_REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2)
+		PACKAGE_SOURCE=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2)
+
+		rm -f $TEMPFILE
+	fi
+
+
+fi
+
+echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $out/revision
+echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $out/revision
+
+echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $out/revision.m4
+echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $out/revision.m4
+
diff --git a/configure.ac b/configure.ac
index 8cfa588..c2dd04b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,8 +70,11 @@ AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
 
 #--[ Version & Revision ]-------------------------------------------------------------------------------------------------------------------------------------
 
-AC_DEFINE(PACKAGE_REVISION,"SVN_REV")
-AC_SUBST(PACKAGE_REVISION, "SVN_REV")
+AC_DEFINE(PACKAGE_REVISION,"SVN_REVISION")
+AC_SUBST(PACKAGE_REVISION,"SVN_REVISION")
+
+AC_DEFINE(PACKAGE_SOURCE,"SVN_URL")
+AC_SUBST(PACKAGE_SOURCE,"SVN_URL")
 
 #--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
 
@@ -202,10 +205,11 @@ AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?]))
 
 PKG_CHECK_EXISTS
 
-PKG_CHECK_MODULES( [GTK], [gtk+-3.0], [ ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.8]) ], [ ] )
+PKG_CHECK_MODULES( [GTK], [gtk+-3.0], [ GTK_VERSION="3" ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.8], [ GTK_VERSION="2" ] ) ], [  ] )
 
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_VERSION)
 
 #--[ SSL ]----------------------------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/get_versions.sh b/get_versions.sh
deleted file mode 100755
index cf76779..0000000
--- a/get_versions.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-REVISION=`date +%y%m%d%H%M`
-
-if test -d ".svn" ; then
-
-	SVN=`which svn 2> /dev/null`
-
-	if test -x "$SVN" ; then
-
-		TEMPFILE=$(mktemp)
-		LANG="EN_US"
-		$SVN info > $TEMPFILE 2> /dev/null
-		REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2)
-		REPOSITORY=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2)
-
-		rm -f $TEMPFILE
-	fi
-
-
-fi
-
-echo "REVISION=$REVISION"
-echo "REPOSITORY=$REPOSITORY"
-
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 2a1e32c..5cd9a68 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -62,14 +62,13 @@ Source:         %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       openssl shared-mime-info
 Distribution:    %_distro
-BuildRequires:  autoconf automake gcc-c++ sed pkgconfig gtk2-devel libgnome-devel gettext-devel libopenssl-devel findutils
+BuildRequires:  autoconf automake gcc-c++ sed pkgconfig gtk@GTK_VERSION@-devel gettext-devel libopenssl-devel findutils coreutils
 
 %description
 IBM 3270 terminal emulator gtk. It can be used to communicate with
 any IBM host that supports 3270-style connections over TELNET.
 
-SVN Revision:		@PACKAGE_REVISION@
-SVN sources from:	@PACKAGE_SOURCE@
+Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
 
 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
 
--
libgit2 0.21.2