diff --git a/Makefile.in b/Makefile.in index 94ee68b..e504b46 100644 --- a/Makefile.in +++ b/Makefile.in @@ -305,6 +305,7 @@ $(SRCDIR): \ $(SRCDIR)/src/pw3270 \ $(SRCDIR)/src/libpw3270cpp \ $(SRCDIR)/sdk \ + $(SRCDIR)/branding \ $(SRCDIR)/src/plugins/dbus3270 \ $(SRCDIR)/src/plugins/hllapi diff --git a/branding/Makefile.in b/branding/Makefile.in index 8fd6b6f..049ae1a 100644 --- a/branding/Makefile.in +++ b/branding/Makefile.in @@ -33,6 +33,7 @@ exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ BASEDIR=@BASEDIR@ +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/branding BINDIR=$(BASEDIR)/.bin MKDIR=@MKDIR_P@ @@ -52,6 +53,11 @@ $(BINDIR)/%.png: \ @$(SVG2PNG) $< --format=png > $@ @$(OPTIPNG) -o7 $@ +$(SRCDIR): + + @$(MKDIR) $@ + @$(INSTALL_DATA) $(PACKAGE_NAME).svg $(PACKAGE_NAME)-logo.svg *.in $@ + $(BINDIR)/%.png: \ %.png diff --git a/configure.ac b/configure.ac index 2cdd0a5..6db555a 100644 --- a/configure.ac +++ b/configure.ac @@ -165,10 +165,10 @@ dnl --------------------------------------------------------------------------- dnl Version info dnl --------------------------------------------------------------------------- -AC_ARG_WITH([revision], [AS_HELP_STRING([--with-revision], [Set revision])], [ app_cv_revision="$withval" ],[ app_cv_revision="`date +%Y%m%d`" ]) +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%Y%m%d`" ]) -AC_DEFINE_UNQUOTED(PACKAGE_REVISION, $app_cv_revision) -AC_SUBST(PACKAGE_REVISION,$app_cv_revision) +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release) +AC_SUBST(PACKAGE_RELEASE,$app_cv_release) app_vrs_major=$(echo $VERSION | cut -d. -f1) app_vrs_minor=$(echo $VERSION | cut -d. -f2) diff --git a/locale/Makefile.in b/locale/Makefile.in index 3341ce1..9d11522 100644 --- a/locale/Makefile.in +++ b/locale/Makefile.in @@ -67,7 +67,7 @@ $(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ @echo $< ... @$(MKDIR) `dirname $@` - @echo $(INSTALL_DATA) $^ $@ + @$(INSTALL_DATA) $^ $@ #---[ Targets ]-------------------------------------------------------------------------- diff --git a/rpm/pw3270.spec b/rpm/pw3270.spec index f0b4928..9896c8d 100644 --- a/rpm/pw3270.spec +++ b/rpm/pw3270.spec @@ -190,10 +190,6 @@ Plugin exporting a DBUS object from every %{name} open session. %setup -q -n pw3270-%{version} -echo "m4_define([SVN_REVISION], %{release})" > revision.m4 -echo "m4_define([SVN_URL], http://softwarepublico.gov.br/gitlab/pw3270/principal.git)" >> revision.m4 -echo "m4_define([APP_LEVEL], 0)" >> revision.m4 - aclocal autoconf @@ -201,14 +197,16 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" export FFLAGS="$RPM_OPT_FLAGS" -%configure +%configure --with-release=%{release} + +cat src/include/lib3270/config.h %build make clean make all %install -%makeinstall +%make_install %find_lang pw3270 langfiles diff --git a/src/include/lib3270/config.h.in b/src/include/lib3270/config.h.in index eac2bb8..c0b8a23 100644 --- a/src/include/lib3270/config.h.in +++ b/src/include/lib3270/config.h.in @@ -35,7 +35,7 @@ #undef PACKAGE_NAME #undef PACKAGE_VERSION - #undef PACKAGE_REVISION + #undef PACKAGE_RELEASE #undef HAVE_GNUC_VISIBILITY #undef HAVE_LIBM diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 7c1d164..dca8fe9 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -244,10 +244,6 @@ $(SRCDIR): \ @$(MKDIR) $@ @$(INSTALL_DATA) *.c *.h *.in *.cbp $@ - @$(MKDIR) $@/svg - @$(INSTALL_DATA) svg/*.svg $@/svg - - #---[ Debug Targets ]-------------------------------------------------------------------- Debug: \ diff --git a/src/pw3270/dialog.c b/src/pw3270/dialog.c index 683e835..8d7d9ce 100644 --- a/src/pw3270/dialog.c +++ b/src/pw3270/dialog.c @@ -509,10 +509,10 @@ g_free(filename); g_free(text); -#ifdef PACKAGE_REVISION - text = g_strdup_printf(_("Version %s - Revision %s"),PACKAGE_VERSION,G_STRINGIFY(PACKAGE_REVISION)); +#ifdef PACKAGE_RELEASE + text = g_strdup_printf(_("Version %s-%s"),PACKAGE_VERSION,G_STRINGIFY(PACKAGE_RELEASE)); #else - text = g_strdup_printf(_("Version %s - Revision %08lx"),PACKAGE_VERSION,BUILD_DATE); + text = g_strdup_printf(_("Version %s-%s"),PACKAGE_VERSION,G_STRINGIFY(BUILD_DATE)); #endif // PACKAGE_REVISION gtk_about_dialog_set_version(dialog,text); -- libgit2 0.21.2