Download as
Browse Code »

Commit 61c32a7ae84ef0d20204cafaf028486bbd576f6b

Authored by perry.werneck@gmail.com
1 parent e4cffdc6
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Atualizando identificacao de revisao/versao

Showing 5 changed files with 48 additions and 31 deletions   Show diff stats
@@ -100,6 +100,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean @@ -100,6 +100,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean
100 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 100 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
101 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 101 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
102 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 102 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
  103 + @./bootstrap.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
103 @cp configure.ac $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 104 @cp configure.ac $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
104 @cp configure $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 105 @cp configure $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
105 @cp *.in $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 106 @cp *.in $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
bootstrap.sh 0 → 100755
  Diff comments   View file @61c32a7
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
  1 +#!/bin/bash
  2 +
  3 +if test -z $1; then
  4 + out=`dirname $0`
  5 +else
  6 + out="$1"
  7 +fi
  8 +
  9 +if test -e revision ; then
  10 + . revision
  11 +fi
  12 +
  13 +PACKAGE_REVISION=`date +%y%m%d`
  14 +
  15 +if test -d ".svn" ; then
  16 +
  17 + SVN=`which svn 2> /dev/null`
  18 +
  19 + if test -x "$SVN" ; then
  20 +
  21 + TEMPFILE=$(mktemp)
  22 + LANG="EN_US"
  23 + $SVN info > $TEMPFILE 2> /dev/null
  24 + PACKAGE_REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2)
  25 + PACKAGE_SOURCE=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2)
  26 +
  27 + rm -f $TEMPFILE
  28 + fi
  29 +
  30 +
  31 +fi
  32 +
  33 +echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $out/revision
  34 +echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $out/revision
  35 +
  36 +echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $out/revision.m4
  37 +echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $out/revision.m4
  38 +
@@ -70,8 +70,11 @@ AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) @@ -70,8 +70,11 @@ AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
70 70
71 #--[ Version & Revision ]------------------------------------------------------------------------------------------------------------------------------------- 71 #--[ Version & Revision ]-------------------------------------------------------------------------------------------------------------------------------------
72 72
73 -AC_DEFINE(PACKAGE_REVISION,"SVN_REV")  
74 -AC_SUBST(PACKAGE_REVISION, "SVN_REV") 73 +AC_DEFINE(PACKAGE_REVISION,"SVN_REVISION")
  74 +AC_SUBST(PACKAGE_REVISION,"SVN_REVISION")
  75 +
  76 +AC_DEFINE(PACKAGE_SOURCE,"SVN_URL")
  77 +AC_SUBST(PACKAGE_SOURCE,"SVN_URL")
75 78
76 #--[ Set host based options ]--------------------------------------------------------------------------------------------------------------------------------- 79 #--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
77 80
@@ -202,10 +205,11 @@ AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?])) @@ -202,10 +205,11 @@ AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?]))
202 205
203 PKG_CHECK_EXISTS 206 PKG_CHECK_EXISTS
204 207
205 -PKG_CHECK_MODULES( [GTK], [gtk+-3.0], [ ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.8]) ], [ ] ) 208 +PKG_CHECK_MODULES( [GTK], [gtk+-3.0], [ GTK_VERSION="3" ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.8], [ GTK_VERSION="2" ] ) ], [ ] )
206 209
207 AC_SUBST(GTK_LIBS) 210 AC_SUBST(GTK_LIBS)
208 AC_SUBST(GTK_CFLAGS) 211 AC_SUBST(GTK_CFLAGS)
  212 +AC_SUBST(GTK_VERSION)
209 213
210 #--[ SSL ]---------------------------------------------------------------------------------------------------------------------------------------------------- 214 #--[ SSL ]----------------------------------------------------------------------------------------------------------------------------------------------------
211 215
get_versions.sh
View file @e4cffdc
@@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
1 -#!/bin/bash  
2 -  
3 -REVISION=`date +%y%m%d%H%M`  
4 -  
5 -if test -d ".svn" ; then  
6 -  
7 - SVN=`which svn 2> /dev/null`  
8 -  
9 - if test -x "$SVN" ; then  
10 -  
11 - TEMPFILE=$(mktemp)  
12 - LANG="EN_US"  
13 - $SVN info > $TEMPFILE 2> /dev/null  
14 - REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2)  
15 - REPOSITORY=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2)  
16 -  
17 - rm -f $TEMPFILE  
18 - fi  
19 -  
20 -  
21 -fi  
22 -  
23 -echo "REVISION=$REVISION"  
24 -echo "REPOSITORY=$REPOSITORY"  
25 -  
pw3270.spec.in
  Diff comments   View file @61c32a7
@@ -62,14 +62,13 @@ Source: %{name}-%{version}.tar.gz @@ -62,14 +62,13 @@ Source: %{name}-%{version}.tar.gz
62 BuildRoot: %{_tmppath}/%{name}-%{version}-build 62 BuildRoot: %{_tmppath}/%{name}-%{version}-build
63 Requires: openssl shared-mime-info 63 Requires: openssl shared-mime-info
64 Distribution: %_distro 64 Distribution: %_distro
65 -BuildRequires: autoconf automake gcc-c++ sed pkgconfig gtk2-devel libgnome-devel gettext-devel libopenssl-devel findutils 65 +BuildRequires: autoconf automake gcc-c++ sed pkgconfig gtk@GTK_VERSION@-devel gettext-devel libopenssl-devel findutils coreutils
66 66
67 %description 67 %description
68 IBM 3270 terminal emulator gtk. It can be used to communicate with 68 IBM 3270 terminal emulator gtk. It can be used to communicate with
69 any IBM host that supports 3270-style connections over TELNET. 69 any IBM host that supports 3270-style connections over TELNET.
70 70
71 -SVN Revision: @PACKAGE_REVISION@  
72 -SVN sources from: @PACKAGE_SOURCE@ 71 +Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
73 72
74 #---[ Build & Install ]----------------------------------------------------------------------------------------------- 73 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
75 74