Download as
Browse Code »

Commit cbe0d1615924ef1ff1d3abf954f4b005f4d88b78

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

Updating package control files.

Showing 2 changed files with 9 additions and 22 deletions   Show diff stats
@@ -13,10 +13,10 @@ @@ -13,10 +13,10 @@
13 </service> 13 </service>
14 14
15 <!-- https://github.com/openSUSE/obs-service-extract_file --> 15 <!-- https://github.com/openSUSE/obs-service-extract_file -->
16 - <service name="extract_file"> 16 + <!-- service name="extract_file">
17 <param name="archive">*.tar</param> 17 <param name="archive">*.tar</param>
18 <param name="files">*/rpm/pw3270.spec</param> 18 <param name="files">*/rpm/pw3270.spec</param>
19 - </service> 19 + </service -->
20 20
21 <service name="extract_file"> 21 <service name="extract_file">
22 <param name="archive">*.tar</param> 22 <param name="archive">*.tar</param>
@@ -47,11 +47,11 @@ @@ -47,11 +47,11 @@
47 <param name="outfilename">debian.compat</param> 47 <param name="outfilename">debian.compat</param>
48 </service> 48 </service>
49 49
50 - <service name="extract_file"> 50 + <!-- service name="extract_file">
51 <param name="archive">*.tar</param> 51 <param name="archive">*.tar</param>
52 <param name="files">*/debian/shlibs</param> 52 <param name="files">*/debian/shlibs</param>
53 <param name="outfilename">debian.shlibs</param> 53 <param name="outfilename">debian.shlibs</param>
54 - </service> 54 + </service -->
55 55
56 <service name="extract_file"> 56 <service name="extract_file">
57 <param name="archive">*.tar</param> 57 <param name="archive">*.tar</param>
rpm/pw3270.spec
  Diff comments   View file @cbe0d16
@@ -37,6 +37,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,6 +37,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
37 Requires: shared-mime-info 37 Requires: shared-mime-info
38 Requires: %{name}-branding = %{version} 38 Requires: %{name}-branding = %{version}
39 39
  40 +Recommends: libv3270-config
  41 +
40 #--[ Setup by distribution ]------------------------------------------------------------------------------------------ 42 #--[ Setup by distribution ]------------------------------------------------------------------------------------------
41 # 43 #
42 # References: 44 # References:
@@ -118,20 +120,6 @@ GTK-based IBM 3270 terminal emulator with many advanced features. It can be used @@ -118,20 +120,6 @@ GTK-based IBM 3270 terminal emulator with many advanced features. It can be used
118 120
119 This package contains the default branding for %{name}. 121 This package contains the default branding for %{name}.
120 122
121 -%package keypads  
122 -Summary: Keypads for %{name}  
123 -Group: System/X11/Terminals  
124 -Requires: %{name} = %{version}  
125 -BuildArch: noarch  
126 -  
127 -Conflicts: otherproviders(pw3270-keypads)  
128 -Enhances: %{name}  
129 -  
130 -%description keypads  
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.  
132 -  
133 -This package contains the keypads for %{name}.  
134 -  
135 #---[ Build & Install ]----------------------------------------------------------------------------------------------- 123 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
136 124
137 %prep 125 %prep
@@ -174,10 +162,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. @@ -174,10 +162,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
174 # Desktop files 162 # Desktop files
175 %{_datadir}/applications/*.desktop 163 %{_datadir}/applications/*.desktop
176 %{_datadir}/appdata/*.appdata.xml 164 %{_datadir}/appdata/*.appdata.xml
177 -%{_datadir}/icons/hicolor/scalable/apps/*.svg  
178 165
179 # Icons 166 # Icons
180 %{_datadir}/%{_product}/icons/*.svg 167 %{_datadir}/%{_product}/icons/*.svg
  168 +%{_datadir}/icons/*.svg
  169 +%{_datadir}/icons/hicolor/scalable/apps/*.svg
  170 +%{_datadir}/icons/hicolor/symbolic/apps/*.svg
181 171
182 # Configuration & Themes 172 # Configuration & Themes
183 %{_datadir}/glib-2.0/schemas/*.xml 173 %{_datadir}/glib-2.0/schemas/*.xml
@@ -188,9 +178,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. @@ -188,9 +178,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
188 %{_datadir}/%{_product}/ui/* 178 %{_datadir}/%{_product}/ui/*
189 %{_datadir}/%{_product}/*.svg 179 %{_datadir}/%{_product}/*.svg
190 180
191 -%files keypads  
192 -%{_datadir}/%{_product}/keypad/*  
193 -  
194 %posttrans 181 %posttrans
195 /usr/bin/update-desktop-database 182 /usr/bin/update-desktop-database
196 183