Download as
Browse Code »

Commit db82b321a2fa8b49299126c41b3d48673da5f239

Authored by Perry Werneck
1 parent d2067b91
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Updating launcher and package info.

Showing 3 changed files with 65 additions and 66 deletions   Show diff stats
branding/Makefile.in
  Diff comments   View file @db82b32
... ... @@ -89,17 +89,17 @@ $(DESTDIR)$(datarootdir)/pixmaps/%.png: \
89 89  
90 90 install: \
91 91 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).png \
92   - $(DESTDIR)$(datarootdir)/pixmaps/$(PACKAGE_TARNAME).png \
  92 + $(DESTDIR)$(datarootdir)/pixmaps/$(PRODUCT_NAME).png \
93 93 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME)-logo.png
94 94  
95 95 @$(INSTALL_DATA) \
96 96 launcher.desktop \
97   - $(PACKAGE_NAME).desktop
  97 + $(PRODUCT_NAME).desktop
98 98  
99 99 $(DESKTOP_INSTALL) \
100 100 --mode 644 \
101 101 --delete-original \
102 102 --dir $(DESTDIR)$(datarootdir)/applications \
103   - $(PACKAGE_NAME).desktop
  103 + $(PRODUCT_NAME).desktop
104 104  
105 105  
... ...
branding/launcher.desktop.in
  Diff comments   View file @db82b32
1 1 [Desktop Entry]
2 2 X-SuSE-translate=true
3   -GenericName=@PACKAGE_NAME@
  3 +GenericName=@PRODUCT_NAME@
4 4 Name=3270 Terminal
5 5 Comment=@PACKAGE_DESCRIPTION@
6   -Exec=@PACKAGE_TARNAME@
7   -Icon=@PACKAGE_TARNAME@
  6 +Exec=@PRODUCT_NAME@
  7 +Icon=@PRODUCT_NAME@
8 8 Terminal=false
9 9 Type=Application
10 10 StartupNotify=true
... ...
rpm/pw3270.spec
  Diff comments   View file @db82b32
... ... @@ -30,19 +30,19 @@
30 30  
31 31 #---[ Packaging ]-----------------------------------------------------------------------------------------------------
32 32  
33   -Name: pw3270
34   -Version: 5.2
35   -Release: 0
36   -Summary: IBM 3270 Terminal emulator for GTK
37   -License: GPL-2.0
38   -Group: System/X11/Terminals
39   -Url: https://portal.softwarepublico.gov.br/social/pw3270/
  33 +Name: pw3270
  34 +Version: 5.2
  35 +Release: 0
  36 +Summary: IBM 3270 Terminal emulator for GTK
  37 +License: GPL-2.0
  38 +Group: System/X11/Terminals
  39 +Url: https://portal.softwarepublico.gov.br/social/pw3270/
40 40  
41   -Source: pw3270-%{version}.tar.xz
  41 +Source: pw3270-%{version}.tar.xz
42 42  
43   -BuildRoot: %{_tmppath}/%{name}-%{version}-build
  43 +BuildRoot: %{_tmppath}/%{name}-%{version}-build
44 44  
45   -Requires: shared-mime-info
  45 +Requires: shared-mime-info
46 46 Requires: %{name}-branding >= 5.2
47 47  
48 48 #--[ Setup by distribution ]------------------------------------------------------------------------------------------
... ... @@ -56,13 +56,13 @@ Requires: %{name}-branding >= 5.2
56 56  
57 57 %if 0%{?rhel_version}
58 58  
59   -%define _help2man 0
  59 +%define _help2man 0
60 60  
61   -BuildRequires: dbus-devel
62   -BuildRequires: dbus-glib-devel
63   -BuildRequires: openssl-devel
64   -BuildRequires: gtk3-devel
65   -BuildRequires: librsvg2-tools
  61 +BuildRequires: dbus-devel
  62 +BuildRequires: dbus-glib-devel
  63 +BuildRequires: openssl-devel
  64 +BuildRequires: gtk3-devel
  65 +BuildRequires: librsvg2-tools
66 66 BuildRequires: lib3270-devel
67 67 BuildRequires: libv3270-devel
68 68  
... ... @@ -74,11 +74,11 @@ BuildRequires: libv3270-devel
74 74  
75 75 %define _help2man 0
76 76  
77   -BuildRequires: dbus-devel
78   -BuildRequires: dbus-glib-devel
79   -BuildRequires: openssl-devel
80   -BuildRequires: gtk3-devel
81   -BuildRequires: librsvg2-tools
  77 +BuildRequires: dbus-devel
  78 +BuildRequires: dbus-glib-devel
  79 +BuildRequires: openssl-devel
  80 +BuildRequires: gtk3-devel
  81 +BuildRequires: librsvg2-tools
82 82 BuildRequires: lib3270-devel
83 83 BuildRequires: libv3270-devel
84 84  
... ... @@ -91,13 +91,13 @@ BuildRequires: python
91 91  
92 92 %if 0%{?fedora}
93 93  
94   -BuildRequires: pkgconfig(dbus-1)
95   -BuildRequires: pkgconfig(dbus-glib-1)
96   -BuildRequires: pkgconfig(openssl)
97   -BuildRequires: pkgconfig(gtk+-3.0)
  94 +BuildRequires: pkgconfig(dbus-1)
  95 +BuildRequires: pkgconfig(dbus-glib-1)
  96 +BuildRequires: pkgconfig(openssl)
  97 +BuildRequires: pkgconfig(gtk+-3.0)
98 98 BuildRequires: pkgconfig(lib3270)
99 99 BuildRequires: pkgconfig(libv3270)
100   -BuildRequires: librsvg2-tools
  100 +BuildRequires: librsvg2-tools
101 101 BuildRequires: autoconf-archive
102 102  
103 103 %endif
... ... @@ -106,35 +106,35 @@ BuildRequires: autoconf-archive
106 106  
107 107 %if 0%{?suse_version}
108 108  
109   -BuildRequires: pkgconfig(openssl)
110   -BuildRequires: pkgconfig(dbus-1)
111   -BuildRequires: pkgconfig(dbus-glib-1)
112   -BuildRequires: pkgconfig(gtk+-3.0)
  109 +BuildRequires: pkgconfig(openssl)
  110 +BuildRequires: pkgconfig(dbus-1)
  111 +BuildRequires: pkgconfig(dbus-glib-1)
  112 +BuildRequires: pkgconfig(gtk+-3.0)
113 113 BuildRequires: pkgconfig(lib3270)
114 114 BuildRequires: pkgconfig(libv3270)
115   -BuildRequires: rsvg-view
  115 +BuildRequires: rsvg-view
116 116  
117 117 # https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
118 118 %if 0%{suse_version} > 120100
119 119 BuildRequires: autoconf-archive
120   -BuildRequires: update-desktop-files
  120 +BuildRequires: update-desktop-files
121 121 %endif
122 122  
123 123 %endif
124 124  
125 125 #---------------------------------------------------------------------------------------------------------------------
126 126  
127   -BuildRequires: autoconf >= 2.61
128   -BuildRequires: automake
129   -BuildRequires: binutils
130   -BuildRequires: coreutils
131   -BuildRequires: desktop-file-utils
132   -BuildRequires: findutils
133   -BuildRequires: gcc-c++
134   -BuildRequires: gettext-devel
135   -BuildRequires: m4
136   -BuildRequires: pkgconfig
137   -BuildRequires: sed
  127 +BuildRequires: autoconf >= 2.61
  128 +BuildRequires: automake
  129 +BuildRequires: binutils
  130 +BuildRequires: coreutils
  131 +BuildRequires: desktop-file-utils
  132 +BuildRequires: findutils
  133 +BuildRequires: gcc-c++
  134 +BuildRequires: gettext-devel
  135 +BuildRequires: m4
  136 +BuildRequires: pkgconfig
  137 +BuildRequires: sed
138 138 BuildRequires: optipng
139 139 BuildRequires: fdupes
140 140 BuildRequires: ImageMagick
... ... @@ -151,8 +151,8 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra
151 151 #--[ Application library ]--------------------------------------------------------------------------------------------
152 152  
153 153 %package -n libpw3270-%{_libvrs}
154   -Summary: 3270 terminal emulation library
155   -Group: System/Libraries
  154 +Summary: PW3270 API for plugins
  155 +Group: System/Libraries
156 156  
157 157 %description -n libpw3270-%{_libvrs}
158 158 GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
... ... @@ -162,12 +162,12 @@ This package contains the plugin support library.
162 162 #--[ Configuration & Branding ]---------------------------------------------------------------------------------------
163 163  
164 164 %package branding
165   -Summary: Configuration and branding for %{name}
166   -Group: System/X11/Terminals
167   -Requires: %{name} = %{version}
  165 +Summary: Configuration and branding for %{name}
  166 +Group: System/X11/Terminals
  167 +Requires: %{name} = %{version}
168 168  
169 169 Provides: %{name}-config = %{version}
170   -Conflicts: otherproviders(%{name}-config)
  170 +Conflicts: otherproviders(%{name}-config)
171 171  
172 172  
173 173 %description branding
... ... @@ -178,14 +178,14 @@ This package contains the default configuration and branding for %{name}.
178 178 #--[ Devel ]----------------------------------------------------------------------------------------------------------
179 179  
180 180 %package devel
181   -Summary: Files required for development of %{name} plugins
182   -Group: Development/Libraries/C and C++
  181 +Summary: Files required for development of %{name} plugins
  182 +Group: Development/Libraries/C and C++
183 183  
184   -Requires: pkgconfig(lib3270)
185   -Requires: pkgconfig(libv3270)
186   -Requires: pkgconfig(gtk+-3.0)
187   -Requires: %{name} = %{version}
188   -Requires: libpw3270-%{_libvrs}
  184 +Requires: pkgconfig(lib3270)
  185 +Requires: pkgconfig(libv3270)
  186 +Requires: pkgconfig(gtk+-3.0)
  187 +Requires: %{name} = %{version}
  188 +Requires: libpw3270-%{_libvrs}
189 189  
190 190 %description -n %{name}-devel
191 191 GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
... ... @@ -212,6 +212,9 @@ make all -j1
212 212 %install
213 213 %make_install
214 214  
  215 +# Remove static library
  216 +rm -f %{buildroot}/%{_libdir}/*.a
  217 +
215 218 %find_lang pw3270 langfiles
216 219  
217 220 %fdupes %{buildroot}/%{_prefix}
... ... @@ -228,11 +231,9 @@ make all -j1
228 231 # Main application
229 232 %dir %{_datadir}/pw3270
230 233 %dir %{_datadir}/pw3270/ui
231   -%dir %{_datadir}/pw3270/charsets
232 234 %dir %{_libdir}/pw3270-plugins
233 235  
234 236 %{_bindir}/pw3270
235   -%{_datadir}/pw3270/charsets/bracket.xml
236 237  
237 238 %files -n libpw3270-%{_libvrs}
238 239 %defattr(-,root,root)
... ... @@ -246,7 +247,6 @@ make all -j1
246 247 %{_datadir}/pw3270/ui/00default.xml
247 248 %{_datadir}/pw3270/ui/10functions.xml
248 249 %{_datadir}/pw3270/ui/10keypad.xml
249   -%{_datadir}/pw3270/colors.conf
250 250 %{_datadir}/pw3270/pw3270.png
251 251 %{_datadir}/pw3270/pw3270-logo.png
252 252 %{_datadir}/pixmaps/pw3270.png
... ... @@ -259,7 +259,6 @@ make all -j1
259 259  
260 260 %{_libdir}/libpw3270.so
261 261  
262   -%{_libdir}/libpw3270cpp.a
263 262 %{_libdir}/pkgconfig/pw3270.pc
264 263 %{_datadir}/pw3270/locale
265 264  
... ...