Download as
Browse Code »

Commit 69b049257fc25a9f447d7d201973cfcde68ed9e9

Authored by Perry Werneck
1 parent 6c4a1a7e
Exists in master and in 1 other branch develop

Updating sdk and rpm package files.

Showing 6 changed files with 189 additions and 4 deletions   Show diff stats
@@ -303,11 +303,11 @@ install: \ @@ -303,11 +303,11 @@ install: \
303 @mkdir -p $(DESTDIR)$(includedir)/$(LIBNAME) 303 @mkdir -p $(DESTDIR)$(includedir)/$(LIBNAME)
304 304
305 @$(INSTALL_DATA) \ 305 @$(INSTALL_DATA) \
306 - ../include/$(LIBNAME)/*.h \ 306 + src/include/v3270/*.h \
307 $(DESTDIR)$(includedir)/$(LIBNAME) 307 $(DESTDIR)$(includedir)/$(LIBNAME)
308 308
309 @$(INSTALL_DATA) \ 309 @$(INSTALL_DATA) \
310 - ../include/$(LIBNAME).h \ 310 + src/include/v3270.h \
311 $(DESTDIR)$(includedir)/$(LIBNAME).h 311 $(DESTDIR)$(includedir)/$(LIBNAME).h
312 312
313 # Install PKG-CONFIG files 313 # Install PKG-CONFIG files
@@ -341,7 +341,7 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ @@ -341,7 +341,7 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
341 341
342 @$(MKDIR) `dirname $@` 342 @$(MKDIR) `dirname $@`
343 @echo $< ... 343 @echo $< ...
344 - $(LD) -o $@ $^ $(LDFLAGS) $(LIBS) 344 + $(LD) -o $@ $^ -Wl,-rpath,$(BINDBG) $(LDFLAGS) $(LIBS)
345 345
346 346
347 run: \ 347 run: \
@@ -374,6 +374,7 @@ dnl Configure which files to generate. @@ -374,6 +374,7 @@ dnl Configure which files to generate.
374 dnl --------------------------------------------------------------------------- 374 dnl ---------------------------------------------------------------------------
375 375
376 AC_CONFIG_FILES(Makefile) 376 AC_CONFIG_FILES(Makefile)
  377 +AC_CONFIG_FILES(libv3270.pc)
377 378
378 dnl --------------------------------------------------------------------------- 379 dnl ---------------------------------------------------------------------------
379 dnl Output the generated config.status script. 380 dnl Output the generated config.status script.
libv3270.pc.in 0 → 100644
  Diff comments   View file @69b0492
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
  1 +prefix=@prefix@
  2 +exec_prefix=@exec_prefix@
  3 +libdir=@libdir@
  4 +includedir=@includedir@
  5 +
  6 +version_major=@PACKAGE_MAJOR_VERSION@
  7 +version_minor=@PACKAGE_MINOR_VERSION@
  8 +sdk_version=@LIB3270_SDK_VERSION@
  9 +
  10 +Name: @PACKAGE_NAME@
  11 +Description: @PACKAGE_DESCRIPTION@
  12 +Version: @PACKAGE_VERSION@
  13 +Libs: -L\@libdir@ -lv3270
  14 +Libs.private: -l3270
  15 +Cflags: -I@includedir@
  16 +
rpm/_service 0 → 100644
  Diff comments   View file @69b0492
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
  1 +<services>
  2 +
  3 + <!-- https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.py -->
  4 + <service name="tar_scm">
  5 + <param name="changesgenerate">enable</param>
  6 + <param name="sslverify">disable</param>
  7 + <param name="versionformat">%ct</param>
  8 + <!-- param name="version">5.2</param -->
  9 + <param name="url">http://softwarepublico.gov.br/gitlab/pw3270/libv3270.git</param>
  10 + <param name="scm">git</param>
  11 + <param name="filename">libv3270-5_2</param>
  12 + </service>
  13 +
  14 + <!-- https://github.com/openSUSE/obs-service-extract_file -->
  15 + <service name="extract_file">
  16 + <param name="archive">*.tar</param>
  17 + <param name="files">*/rpm/libv3270.spec</param>
  18 + <param name="outfilename">libv3270-5_2.spec</param>
  19 + </service>
  20 +
  21 + <service name="recompress">
  22 + <param name="file">*.tar</param>
  23 + <param name="compression">xz</param>
  24 + </service>
  25 +
  26 + <service name="set_version" />
  27 +
  28 +</services>
rpm/libv3270.spec 0 → 100644
  Diff comments   View file @69b0492
@@ -0,0 +1,140 @@ @@ -0,0 +1,140 @@
  1 +#
  2 +# spec file for packages libv3270
  3 +#
  4 +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
  5 +# Copyright (C) <2008> <Banco do Brasil S.A.>
  6 +#
  7 +# All modifications and additions to the file contributed by third parties
  8 +# remain the property of their copyright owners, unless otherwise agreed
  9 +# upon. The license for this file, and modifications and additions to the
  10 +# file, is the same license as for the pristine package itself (unless the
  11 +# license for the pristine package is not an Open Source License, in which
  12 +# case the license is the MIT License). An "Open Source License" is a
  13 +# license that conforms to the Open Source Definition (Version 1.9)
  14 +# published by the Open Source Initiative.
  15 +
  16 +# Please submit bugfixes or comments via http://bugs.opensuse.org/
  17 +#
  18 +
  19 +#---[ Versions ]------------------------------------------------------------------------------------------------------
  20 +
  21 +%define MAJOR_VERSION 5
  22 +%define MINOR_VERSION 2
  23 +
  24 +%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
  25 +
  26 +#Compat macro for new _fillupdir macro introduced in Nov 2017
  27 +%if ! %{defined _fillupdir}
  28 + %define _fillupdir /var/adm/fillup-templates
  29 +%endif
  30 +
  31 +#---[ Macros ]--------------------------------------------------------------------------------------------------------
  32 +
  33 +%if ! %{defined _release}
  34 + %define _release suse%{suse_version}
  35 +%endif
  36 +
  37 +#---[ Main package ]--------------------------------------------------------------------------------------------------
  38 +
  39 +Summary: 3270 Virtual Terminal for GTK
  40 +Name: libv3270-%{_libvrs}
  41 +Version: 5.2
  42 +Release: 0
  43 +License: LGPL-3.0
  44 +Source: %{name}-%{version}.tar.xz
  45 +
  46 +Url: https://portal.softwarepublico.gov.br/social/pw3270/
  47 +
  48 +Group: Development/Libraries/C and C++
  49 +BuildRoot: /var/tmp/%{name}-%{version}
  50 +
  51 +Provides: libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION}
  52 +Conflicts: otherproviders(libv3270_%{MAJOR_VERSION}_%{MINOR_VERSION})
  53 +
  54 +BuildRequires: pkgconfig(openssl)
  55 +BuildRequires: pkgconfig(lib3270)
  56 +BuildRequires: pkgconfig(gtk+-3.0)
  57 +BuildRequires: autoconf >= 2.61
  58 +BuildRequires: automake
  59 +BuildRequires: binutils
  60 +BuildRequires: coreutils
  61 +BuildRequires: gcc-c++
  62 +BuildRequires: gettext-devel
  63 +BuildRequires: m4
  64 +
  65 +%description
  66 +
  67 +TN3270 GTK Virtual terminal Widget originally designed as part of the pw3270 application.
  68 +
  69 +See more details at https://softwarepublico.gov.br/social/pw3270/
  70 +
  71 +#---[ Development ]---------------------------------------------------------------------------------------------------
  72 +
  73 +%package devel
  74 +
  75 +Summary: 3270 Virtual Terminal for GTK development files
  76 +Group: Development/Libraries/C and C++
  77 +
  78 +Requires: %{name} = %{version}
  79 +
  80 +Provides: libv3270-devel = %{version}
  81 +Conflicts: otherproviders(libv3270-devel)
  82 +
  83 +%description devel
  84 +
  85 +3270 Virtual Terminal for GTK development files.
  86 +
  87 +Originally designed as part of the pw3270 application.
  88 +
  89 +See more details at https://softwarepublico.gov.br/social/pw3270/
  90 +
  91 +#---[ Build & Install ]-----------------------------------------------------------------------------------------------
  92 +
  93 +%prep
  94 +%setup
  95 +
  96 +NOCONFIGURE=1 ./autogen.sh
  97 +
  98 +%configure \
  99 + --with-sdk-version=%{version}
  100 +
  101 +%build
  102 +make clean
  103 +make all
  104 +
  105 +%install
  106 +rm -rf $RPM_BUILD_ROOT
  107 +
  108 +%makeinstall
  109 +
  110 +%files
  111 +%defattr(-,root,root)
  112 +%doc AUTHORS LICENSE README.md
  113 +
  114 +%{_libdir}/libv3270.so.5
  115 +%{_libdir}/libv3270.so.5.2
  116 +
  117 +%files devel
  118 +%defattr(-,root,root)
  119 +
  120 +%{_libdir}/libv3270.so
  121 +%{_libdir}/pkgconfig/libv3270.pc
  122 +
  123 +%{_includedir}/libv3270.h
  124 +%{_includedir}/libv3270
  125 +
  126 +%{_libdir}/libv3270.a
  127 +
  128 +%pre
  129 +/sbin/ldconfig
  130 +exit 0
  131 +
  132 +%post
  133 +/sbin/ldconfig
  134 +exit 0
  135 +
  136 +%postun
  137 +/sbin/ldconfig
  138 +exit 0
  139 +
  140 +%changelog
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <Unit filename="src/dialogs/hostselect.c"> 44 <Unit filename="src/dialogs/hostselect.c">
45 <Option compilerVar="CC" /> 45 <Option compilerVar="CC" />
46 </Unit> 46 </Unit>
47 - <Unit filename="src/dialogs/hostselect.h" /> 47 + <Unit filename="src/dialogs/private.h" />
48 <Unit filename="src/include/accessible.h" /> 48 <Unit filename="src/include/accessible.h" />
49 <Unit filename="src/include/config.h" /> 49 <Unit filename="src/include/config.h" />
50 <Unit filename="src/include/hostselect.h" /> 50 <Unit filename="src/include/hostselect.h" />