Download as
Browse Code »

Commit 83927c4117d983e4b46709fda78d6c8b5aac9866

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

Acertando empacotamento

Showing 5 changed files with 198 additions and 12 deletions   Show diff stats
AUTHORS 0 → 100644
  Diff comments   View file @83927c4
... ... @@ -0,0 +1,5 @@
  1 +Paul Mattes <Paul.Mattes@usa.net>
  2 +GTRC
  3 +Perry Werneck <perry.werneck@gmail.com>
  4 +and others
  5 +
... ...
LICENSE 0 → 100644
  Diff comments   View file @83927c4
... ... @@ -0,0 +1,166 @@
  1 + GNU LESSER GENERAL PUBLIC LICENSE
  2 + Version 3, 29 June 2007
  3 +
  4 + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  5 + Everyone is permitted to copy and distribute verbatim copies
  6 + of this license document, but changing it is not allowed.
  7 +
  8 +
  9 + This version of the GNU Lesser General Public License incorporates
  10 +the terms and conditions of version 3 of the GNU General Public
  11 +License, supplemented by the additional permissions listed below.
  12 +
  13 + 0. Additional Definitions.
  14 +
  15 + As used herein, "this License" refers to version 3 of the GNU Lesser
  16 +General Public License, and the "GNU GPL" refers to version 3 of the GNU
  17 +General Public License.
  18 +
  19 + "The Library" refers to a covered work governed by this License,
  20 +other than an Application or a Combined Work as defined below.
  21 +
  22 + An "Application" is any work that makes use of an interface provided
  23 +by the Library, but which is not otherwise based on the Library.
  24 +Defining a subclass of a class defined by the Library is deemed a mode
  25 +of using an interface provided by the Library.
  26 +
  27 + A "Combined Work" is a work produced by combining or linking an
  28 +Application with the Library. The particular version of the Library
  29 +with which the Combined Work was made is also called the "Linked
  30 +Version".
  31 +
  32 + The "Minimal Corresponding Source" for a Combined Work means the
  33 +Corresponding Source for the Combined Work, excluding any source code
  34 +for portions of the Combined Work that, considered in isolation, are
  35 +based on the Application, and not on the Linked Version.
  36 +
  37 + The "Corresponding Application Code" for a Combined Work means the
  38 +object code and/or source code for the Application, including any data
  39 +and utility programs needed for reproducing the Combined Work from the
  40 +Application, but excluding the System Libraries of the Combined Work.
  41 +
  42 + 1. Exception to Section 3 of the GNU GPL.
  43 +
  44 + You may convey a covered work under sections 3 and 4 of this License
  45 +without being bound by section 3 of the GNU GPL.
  46 +
  47 + 2. Conveying Modified Versions.
  48 +
  49 + If you modify a copy of the Library, and, in your modifications, a
  50 +facility refers to a function or data to be supplied by an Application
  51 +that uses the facility (other than as an argument passed when the
  52 +facility is invoked), then you may convey a copy of the modified
  53 +version:
  54 +
  55 + a) under this License, provided that you make a good faith effort to
  56 + ensure that, in the event an Application does not supply the
  57 + function or data, the facility still operates, and performs
  58 + whatever part of its purpose remains meaningful, or
  59 +
  60 + b) under the GNU GPL, with none of the additional permissions of
  61 + this License applicable to that copy.
  62 +
  63 + 3. Object Code Incorporating Material from Library Header Files.
  64 +
  65 + The object code form of an Application may incorporate material from
  66 +a header file that is part of the Library. You may convey such object
  67 +code under terms of your choice, provided that, if the incorporated
  68 +material is not limited to numerical parameters, data structure
  69 +layouts and accessors, or small macros, inline functions and templates
  70 +(ten or fewer lines in length), you do both of the following:
  71 +
  72 + a) Give prominent notice with each copy of the object code that the
  73 + Library is used in it and that the Library and its use are
  74 + covered by this License.
  75 +
  76 + b) Accompany the object code with a copy of the GNU GPL and this license
  77 + document.
  78 +
  79 + 4. Combined Works.
  80 +
  81 + You may convey a Combined Work under terms of your choice that,
  82 +taken together, effectively do not restrict modification of the
  83 +portions of the Library contained in the Combined Work and reverse
  84 +engineering for debugging such modifications, if you also do each of
  85 +the following:
  86 +
  87 + a) Give prominent notice with each copy of the Combined Work that
  88 + the Library is used in it and that the Library and its use are
  89 + covered by this License.
  90 +
  91 + b) Accompany the Combined Work with a copy of the GNU GPL and this license
  92 + document.
  93 +
  94 + c) For a Combined Work that displays copyright notices during
  95 + execution, include the copyright notice for the Library among
  96 + these notices, as well as a reference directing the user to the
  97 + copies of the GNU GPL and this license document.
  98 +
  99 + d) Do one of the following:
  100 +
  101 + 0) Convey the Minimal Corresponding Source under the terms of this
  102 + License, and the Corresponding Application Code in a form
  103 + suitable for, and under terms that permit, the user to
  104 + recombine or relink the Application with a modified version of
  105 + the Linked Version to produce a modified Combined Work, in the
  106 + manner specified by section 6 of the GNU GPL for conveying
  107 + Corresponding Source.
  108 +
  109 + 1) Use a suitable shared library mechanism for linking with the
  110 + Library. A suitable mechanism is one that (a) uses at run time
  111 + a copy of the Library already present on the user's computer
  112 + system, and (b) will operate properly with a modified version
  113 + of the Library that is interface-compatible with the Linked
  114 + Version.
  115 +
  116 + e) Provide Installation Information, but only if you would otherwise
  117 + be required to provide such information under section 6 of the
  118 + GNU GPL, and only to the extent that such information is
  119 + necessary to install and execute a modified version of the
  120 + Combined Work produced by recombining or relinking the
  121 + Application with a modified version of the Linked Version. (If
  122 + you use option 4d0, the Installation Information must accompany
  123 + the Minimal Corresponding Source and Corresponding Application
  124 + Code. If you use option 4d1, you must provide the Installation
  125 + Information in the manner specified by section 6 of the GNU GPL
  126 + for conveying Corresponding Source.)
  127 +
  128 + 5. Combined Libraries.
  129 +
  130 + You may place library facilities that are a work based on the
  131 +Library side by side in a single library together with other library
  132 +facilities that are not Applications and are not covered by this
  133 +License, and convey such a combined library under terms of your
  134 +choice, if you do both of the following:
  135 +
  136 + a) Accompany the combined library with a copy of the same work based
  137 + on the Library, uncombined with any other library facilities,
  138 + conveyed under the terms of this License.
  139 +
  140 + b) Give prominent notice with the combined library that part of it
  141 + is a work based on the Library, and explaining where to find the
  142 + accompanying uncombined form of the same work.
  143 +
  144 + 6. Revised Versions of the GNU Lesser General Public License.
  145 +
  146 + The Free Software Foundation may publish revised and/or new versions
  147 +of the GNU Lesser General Public License from time to time. Such new
  148 +versions will be similar in spirit to the present version, but may
  149 +differ in detail to address new problems or concerns.
  150 +
  151 + Each version is given a distinguishing version number. If the
  152 +Library as you received it specifies that a certain numbered version
  153 +of the GNU Lesser General Public License "or any later version"
  154 +applies to it, you have the option of following the terms and
  155 +conditions either of that published version or of any later version
  156 +published by the Free Software Foundation. If the Library as you
  157 +received it does not specify a version number of the GNU Lesser
  158 +General Public License, you may choose any version of the GNU Lesser
  159 +General Public License ever published by the Free Software Foundation.
  160 +
  161 + If the Library as you received it specifies that a proxy can decide
  162 +whether future versions of the GNU Lesser General Public License shall
  163 +apply, that proxy's public statement of acceptance of any version is
  164 +permanent authorization for you to choose that version for the
  165 +Library.
  166 +
... ...
Makefile.in
  Diff comments   View file @83927c4
... ... @@ -46,15 +46,18 @@ docdir=@docdir@
46 46 sysconfdir=@sysconfdir@
47 47  
48 48 BINDIR=.bin
49   -TMPDIR=.tmp
50 49 EXEEXT=@EXEEXT@
51 50 DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270
52 51 RLSLIB=-L../../$(BINDIR)/Release/lib -l3270
  52 +TMPDIR=$(PWD)/.tmp
53 53  
54 54 #---[ Tools ]------------------------------------------------------------------
55 55  
56 56 VALGRIND=@VALGRIND@
57 57 MKDIR=@MKDIR_P@
  58 +INSTALL=@INSTALL@
  59 +INSTALL_PROGRAM=@INSTALL_PROGRAM@
  60 +INSTALL_DATA=@INSTALL_DATA@
58 61  
59 62 #---[ Release targets ]--------------------------------------------------------
60 63  
... ... @@ -83,6 +86,9 @@ run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
83 86  
84 87 tgz: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
85 88  
  89 +rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
  90 + @rpmbuild -ta $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
  91 +
86 92 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean
87 93 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
88 94 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
... ... @@ -90,15 +96,26 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean
90 96 @cp configure.ac $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
91 97 @cp configure $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
92 98 @cp *.in $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
  99 + @cp AUTHORS LICENSE $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
93 100 @cp -r src $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
94 101 @cp -r scripts $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
95   - @tar --create --gzip --verbose --directory $(TMPDIR) --exclude-vcs --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
  102 + @cp $(PACKAGE_TARNAME).spec $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
  103 +
  104 + @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui
  105 + @cp ui/* $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/ui
  106 +
  107 + @tar --create --gzip --directory $(TMPDIR) --exclude-vcs --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
  108 +
  109 + @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
96 110 @echo $@
97 111  
98 112 install:
99 113 @make BINRLS="../../.bin/Release/lib" -C src/lib3270 install
100 114 @make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk install
101 115  
  116 + @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
  117 + @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
  118 +
102 119 clean:
103 120 @rm -fr .obj
104 121 @rm -fr .bin
... ...
configure.ac
  Diff comments   View file @83927c4
... ... @@ -202,6 +202,7 @@ AC_CONFIG_FILES([
202 202  
203 203 Makefile
204 204 lib3270.pc
  205 + pw3270.spec
205 206 src/include/rules.mak
206 207 src/lib3270/Makefile
207 208 src/lib3270/mkversion.sh
... ...
pw3270.spec.in
  Diff comments   View file @83927c4
... ... @@ -29,20 +29,14 @@
29 29  
30 30 #---[ Check for distro ]----------------------------------------------------------------------------------------------
31 31  
32   -%define _release %{_rel}
33   -%define _distro Linux
  32 +%define _rel 0
  33 +%define _distro Linux
34 34  
35 35 %if 0%{?suse_version}
36 36 %define _release %{_rel}.suse%{suse_version}
37 37 %define _distro SuSE Linux %{suse_version}
38 38 %endif
39 39  
40   -%if 0%{?mdkversion}
41   - %define _release %{_rel}.mdv%{mandriva_release}
42   - %define _redhat 0
43   - %define _distro Mandriva Linux %{mandriva_release}
44   -%endif
45   -
46 40 %if 0%{?fedora_version}
47 41 %define _release %{_rel}.fc%{fedora_version}
48 42 %define _redhat 0
... ... @@ -98,8 +92,11 @@ rm -rf $RPM_BUILD_ROOT
98 92  
99 93 %files
100 94 %defattr(-,root,root)
101   -%doc ChangeLog AUTHORS LICENSE
102   -
  95 +%doc AUTHORS LICENSE
  96 +%{_libdir}/lib3270.so
  97 +%{_bindir}/@PACKAGE_NAME@
  98 +%{_datadir}/@PACKAGE_NAME@/ui/00default.xml
  99 +%{_datadir}/@PACKAGE_NAME@/ui/99debug.xml
103 100  
104 101 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
105 102  
... ...