Download as
Browse Code »

Commit d0a38ab5f5a9cb22aa44f7d91818587d54edee8d

Authored by Perry Werneck
1 parent 6c41809d
Exists in master and in 2 other branches develop, script-support

Updating package control files.

Showing 1 changed file with 44 additions and 55 deletions   Show diff stats
rpm/pw3270.spec
  Diff comments   View file @d0a38ab
... ... @@ -30,17 +30,13 @@ License: GPL-2.0
30 30 Group: System/X11/Terminals
31 31 Url: https://github.com/PerryWerneck/pw3270
32 32  
33   -Source: pw3270-%{version}.tar.xz
  33 +Source: pw3270-%{version}.tar.xz
34 34  
35 35 BuildRoot: %{_tmppath}/%{name}-%{version}-build
36 36  
37 37 Requires: shared-mime-info
38 38 Requires: %{name}-branding = %{version}
39 39  
40   -BuildRequires: update-desktop-files
41   -
42   -%glib2_gsettings_schema_requires
43   -
44 40 #--[ Setup by distribution ]------------------------------------------------------------------------------------------
45 41 #
46 42 # References:
... ... @@ -48,26 +44,14 @@ BuildRequires: update-desktop-files
48 44 # https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto#Detect_a_distribution_flavor_for_special_code
49 45 #
50 46  
51   -#--[ Red HAT ]--------------------------------------------------------------------------------------------------------
52   -
53   -%if 0%{?rhel_version}
54   -
55   -BuildRequires: gtk3-devel
56   -BuildRequires: glib2-devel
57   -BuildRequires: libv3270-devel >= 5.3
58   -
59   -%endif
60   -
61 47 #--[ CentOS ]---------------------------------------------------------------------------------------------------------
62 48  
63 49 %if 0%{?centos_version}
64 50  
65   -BuildRequires: gtk3-devel
66   -BuildRequires: glib2-devel
67   -BuildRequires: libv3270-devel >= 5.3
68   -
69   -# Required for genmarshal
70   -BuildRequires: python
  51 +BuildRequires: gtk3-devel
  52 +BuildRequires: glib2-devel
  53 +BuildRequires: libv3270-devel >= 5.3
  54 +BuildRequires: libappstream-glib
71 55  
72 56 %endif
73 57  
... ... @@ -75,9 +59,10 @@ BuildRequires: python
75 59  
76 60 %if 0%{?fedora}
77 61  
78   -BuildRequires: pkgconfig(gtk+-3.0)
79   -BuildRequires: pkgconfig(glib-2.0)
80   -BuildRequires: pkgconfig(libv3270) >= 5.3
  62 +BuildRequires: pkgconfig(gtk+-3.0)
  63 +BuildRequires: pkgconfig(glib-2.0)
  64 +BuildRequires: pkgconfig(libv3270) >= 5.3
  65 +BuildRequires: libappstream-glib
81 66  
82 67 %endif
83 68  
... ... @@ -85,30 +70,31 @@ BuildRequires: pkgconfig(libv3270) >= 5.3
85 70  
86 71 %if 0%{?suse_version}
87 72  
88   -BuildRequires: pkgconfig(gtk+-3.0)
89   -BuildRequires: pkgconfig(glib-2.0)
90   -BuildRequires: pkgconfig(libv3270) >= 5.3
  73 +BuildRequires: update-desktop-files
  74 +BuildRequires: pkgconfig(gtk+-3.0)
  75 +BuildRequires: pkgconfig(glib-2.0)
  76 +BuildRequires: pkgconfig(libv3270) >= 5.3
  77 +BuildRequires: appstream-glib
  78 +
  79 +%glib2_gsettings_schema_requires
91 80  
92 81 %endif
93 82  
94 83 #---------------------------------------------------------------------------------------------------------------------
95 84  
96   -BuildRequires: autoconf >= 2.61
97   -BuildRequires: automake
98   -BuildRequires: binutils
99   -BuildRequires: coreutils
100   -BuildRequires: desktop-file-utils
101   -BuildRequires: findutils
102   -BuildRequires: gcc-c++
103   -BuildRequires: gettext-devel
104   -BuildRequires: gettext-tools
105   -BuildRequires: m4
106   -BuildRequires: pkgconfig
107   -BuildRequires: sed
108   -BuildRequires: fdupes
109   -BuildRequires: autoconf-archive
110   -
111   -%glib2_gsettings_schema_requires
  85 +BuildRequires: autoconf >= 2.61
  86 +BuildRequires: automake
  87 +BuildRequires: binutils
  88 +BuildRequires: coreutils
  89 +BuildRequires: desktop-file-utils
  90 +BuildRequires: findutils
  91 +BuildRequires: gcc-c++
  92 +BuildRequires: gettext-devel
  93 +BuildRequires: m4
  94 +BuildRequires: pkgconfig
  95 +BuildRequires: sed
  96 +BuildRequires: fdupes
  97 +BuildRequires: autoconf-archive
112 98  
113 99 %description
114 100 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.
... ... @@ -118,13 +104,13 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra
118 104 #--[ Configuration & Branding ]---------------------------------------------------------------------------------------
119 105  
120 106 %package branding
121   -Summary: Default branding for %{name}
122   -Group: System/X11/Terminals
  107 +Summary: Default branding for %{name}
  108 +Group: System/X11/Terminals
123 109  
124   -Requires: %{name} = %{version}
125   -BuildArch: noarch
  110 +Requires: %{name} = %{version}
  111 +BuildArch: noarch
126 112  
127   -Requires(post): desktop-file-utils
  113 +Requires(post): desktop-file-utils
128 114 Requires(postun): desktop-file-utils
129 115  
130 116 %description branding
... ... @@ -133,13 +119,13 @@ GTK-based IBM 3270 terminal emulator with many advanced features. It can be used
133 119 This package contains the default branding for %{name}.
134 120  
135 121 %package keypads
136   -Summary: Keypads for %{name}
137   -Group: System/X11/Terminals
138   -Requires: %{name} = %{version}
139   -BuildArch: noarch
  122 +Summary: Keypads for %{name}
  123 +Group: System/X11/Terminals
  124 +Requires: %{name} = %{version}
  125 +BuildArch: noarch
140 126  
141   -Conflicts: otherproviders(pw3270-keypads)
142   -Enhances: %{name}
  127 +Conflicts: otherproviders(pw3270-keypads)
  128 +Enhances: %{name}
143 129  
144 130 %description keypads
145 131 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.
... ... @@ -167,6 +153,8 @@ make all -j1
167 153  
168 154 %find_lang pw3270 langfiles
169 155  
  156 +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
  157 +
170 158 %fdupes %{buildroot}/%{_prefix}
171 159  
172 160 %files -f langfiles
... ... @@ -185,7 +173,8 @@ make all -j1
185 173  
186 174 # Desktop files
187 175 %{_datadir}/applications/*.desktop
188   -%{_datadir}/appdata/%{_product}.appdata.xml
  176 +%{_datadir}/appdata/*.appdata.xml
  177 +%{_datadir}/icons/hicolor/scalable/apps/*.svg
189 178  
190 179 # Icons
191 180 %{_datadir}/%{_product}/icons/*.svg
... ...