Download as
Browse Code »

Commit 9ddbcbfe01c7ad8102792a5eeb53f0d824cb91ad

Authored by Perry Werneck
1 parent 29ee8ed4
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Updating package files.

Showing 5 changed files with 21 additions and 17 deletions   Show diff stats
rpm/_service
  Diff comments   View file @9ddbcbf
... ... @@ -8,7 +8,7 @@
8 8 <param name="changesgenerate">enable</param>
9 9 <param name="changesauthor">perry.werneck@gmail.com</param>
10 10  
11   - <param name="versionformat">@PARENT_TAG@</param>
  11 + <param name="versionformat">@PARENT_TAG@+git%cd</param>
12 12 <param name="scm">git</param>
13 13 </service>
14 14  
... ...
rpm/pw3270.spec
  Diff comments   View file @9ddbcbf
... ... @@ -22,17 +22,17 @@
22 22  
23 23 #---[ Packaging ]-----------------------------------------------------------------------------------------------------
24 24  
25   -Name: pw3270
26   -Version: 5.3
27   -Release: 0
28   -Summary: IBM 3270 Terminal emulator for GTK
29   -License: GPL-2.0
30   -Group: System/X11/Terminals
31   -Url: https://portal.softwarepublico.gov.br/social/pw3270/
  25 +Name: pw3270
  26 +Version: 5.3
  27 +Release: 0
  28 +Summary: IBM 3270 Terminal emulator for GTK
  29 +License: GPL-2.0
  30 +Group: System/X11/Terminals
  31 +Url: https://github.com/PerryWerneck/pw3270
32 32  
33   -Source: pw3270-%{version}.tar.xz
  33 +Source: pw3270-%{version}.tar.xz
34 34  
35   -BuildRoot: %{_tmppath}/%{name}-%{version}-build
  35 +BuildRoot: %{_tmppath}/%{name}-%{version}-build
36 36  
37 37 Requires: shared-mime-info
38 38 Requires: %{name}-branding = %{version}
... ... @@ -41,7 +41,6 @@ BuildRequires: update-desktop-files
41 41  
42 42 %glib2_gsettings_schema_requires
43 43  
44   -
45 44 #--[ Setup by distribution ]------------------------------------------------------------------------------------------
46 45 #
47 46 # References:
... ... @@ -56,7 +55,7 @@ BuildRequires: update-desktop-files
56 55 BuildRequires: gtk3-devel
57 56 BuildRequires: glib2-devel
58 57 BuildRequires: librsvg2-tools
59   -BuildRequires: libv3270-devel >= %{version}
  58 +BuildRequires: libv3270-devel >= 5.3
60 59  
61 60 %endif
62 61  
... ... @@ -66,7 +65,7 @@ BuildRequires: libv3270-devel &gt;= %{version}
66 65  
67 66 BuildRequires: gtk3-devel
68 67 BuildRequires: glib2-devel
69   -BuildRequires: libv3270-devel
  68 +BuildRequires: libv3270-devel >= 5.3
70 69  
71 70 # Required for genmarshal
72 71 BuildRequires: python
... ... @@ -79,7 +78,7 @@ BuildRequires: python
79 78  
80 79 BuildRequires: pkgconfig(gtk+-3.0)
81 80 BuildRequires: pkgconfig(glib-2.0)
82   -BuildRequires: pkgconfig(libv3270) >= %{version}
  81 +BuildRequires: pkgconfig(libv3270) >= 5.3
83 82  
84 83 %endif
85 84  
... ... @@ -89,7 +88,7 @@ BuildRequires: pkgconfig(libv3270) &gt;= %{version}
89 88  
90 89 BuildRequires: pkgconfig(gtk+-3.0)
91 90 BuildRequires: pkgconfig(glib-2.0)
92   -BuildRequires: pkgconfig(libv3270) >= %{version}
  91 +BuildRequires: pkgconfig(libv3270) >= 5.3
93 92  
94 93 %endif
95 94  
... ... @@ -192,6 +191,7 @@ make all -j1
192 191 %{_datadir}/%{_product}/*.png
193 192 %{_datadir}/applications/*.desktop
194 193 %{_datadir}/pixmaps/*.png
  194 +%{_datadir}/mime/packages/*.xml
195 195  
196 196 %files keypads
197 197 %{_datadir}/%{_product}/keypad/*
... ...
src/main/main.c
  Diff comments   View file @9ddbcbf
... ... @@ -94,6 +94,7 @@ int main (int argc, char **argv) {
94 94 {
95 95 g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
96 96 g_autofree gchar * locdir = g_build_filename(appdir,"locale",NULL);
  97 + debug("Locale from \"%s\"\n",locdir);
97 98 bindtextdomain( PACKAGE_NAME, locdir );
98 99 }
99 100 #endif // _WIN32
... ...
win/pack.sh
  Diff comments   View file @9ddbcbf
... ... @@ -31,7 +31,10 @@ LIBRARY_NAME=&quot;lib3270&quot;
31 31 CORE_LIBRARIES="lib3270 libv3270 libipc3270"
32 32 PACKAGE_PLUGINS=""
33 33 PACKAGE_EXTRAS="libhllapi"
34   -TARGET_ARCHS="x86_64 x86_32"
  34 +
  35 +#TARGET_ARCHS="x86_64 x86_32"
  36 +TARGET_ARCHS="x86_64"
  37 +
35 38 GIT_URL="https://github.com/PerryWerneck"
36 39 BUILD_UNSTABLE=0
37 40 MAKE_ZIP=0
... ...
win/pw3270.nsi.in
  Diff comments   View file @9ddbcbf
... ... @@ -133,7 +133,7 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
133 133  
134 134 # Locale files
135 135 CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES"
136   - file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "share\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
  136 + file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\@PACKAGE_NAME@.mo"
137 137 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo" "share\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo"
138 138 file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo" "share\locale\pt_BR\LC_MESSAGES\libv3270.mo"
139 139  
... ...