Commit e4c170c57a4927f929184462a3e658ee54d4f69a
1 parent
5cf963d6
Exists in
master
and in
1 other branch
Fixing spec file for latest version.
Showing
1 changed file
with
15 additions
and
11 deletions
Show diff stats
rpm/libv3270.spec
@@ -48,7 +48,7 @@ BuildRequires: gtk3-devel | @@ -48,7 +48,7 @@ BuildRequires: gtk3-devel | ||
48 | 48 | ||
49 | %endif | 49 | %endif |
50 | 50 | ||
51 | -%if 0%{?centos_version} | 51 | +%if 0%{?centos_version} && 0%{?centos_version} < 800 |
52 | # CENTOS Genmarshal doesn't depends on python! | 52 | # CENTOS Genmarshal doesn't depends on python! |
53 | BuildRequires: python | 53 | BuildRequires: python |
54 | %endif | 54 | %endif |
@@ -62,19 +62,20 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ . | @@ -62,19 +62,20 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ . | ||
62 | 62 | ||
63 | #---[ Library ]------------------------------------------------------------------------------------------------------- | 63 | #---[ Library ]------------------------------------------------------------------------------------------------------- |
64 | 64 | ||
65 | +%define _product %(pkg-config --variable=product_name lib3270) | ||
65 | %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) | 66 | %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) |
66 | %define MINOR_VERSION %(echo %{version} | cut -d. -f2) | 67 | %define MINOR_VERSION %(echo %{version} | cut -d. -f2) |
67 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} | 68 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} |
68 | 69 | ||
69 | %package -n %{name}-%{_libvrs} | 70 | %package -n %{name}-%{_libvrs} |
70 | -Summary: TN3270 access library | ||
71 | -Group: System/Libraries | 71 | +Summary: TN3270 Access library |
72 | +Group: Development/Libraries/C and C++ | ||
72 | 73 | ||
73 | %description -n %{name}-%{_libvrs} | 74 | %description -n %{name}-%{_libvrs} |
74 | -Originally designed as part of the pw3270 application, this library | ||
75 | -provides a TN3270 virtual terminal widget for GTK 3. | ||
76 | 75 | ||
77 | -For more details, see https://softwarepublico.gov.br/social/pw3270/ . | 76 | +Originally designed as part of the pw3270 application this library provides a TN3270 virtual terminal widget for GTK 3. |
77 | + | ||
78 | +See more details at https://softwarepublico.gov.br/social/pw3270/ | ||
78 | 79 | ||
79 | #---[ Development ]--------------------------------------------------------------------------------------------------- | 80 | #---[ Development ]--------------------------------------------------------------------------------------------------- |
80 | 81 | ||
@@ -104,7 +105,6 @@ Requires: glade | @@ -104,7 +105,6 @@ Requires: glade | ||
104 | 105 | ||
105 | %description -n glade-catalog-v3270 | 106 | %description -n glade-catalog-v3270 |
106 | This package provides a catalog for Glade to allow the use of V3270 | 107 | This package provides a catalog for Glade to allow the use of V3270 |
107 | -widgets in Glade. | ||
108 | 108 | ||
109 | #---[ Build & Install ]----------------------------------------------------------------------------------------------- | 109 | #---[ Build & Install ]----------------------------------------------------------------------------------------------- |
110 | 110 | ||
@@ -114,6 +114,7 @@ widgets in Glade. | @@ -114,6 +114,7 @@ widgets in Glade. | ||
114 | NOCONFIGURE=1 ./autogen.sh | 114 | NOCONFIGURE=1 ./autogen.sh |
115 | 115 | ||
116 | %configure \ | 116 | %configure \ |
117 | + --disable-static \ | ||
117 | --enable-pic | 118 | --enable-pic |
118 | 119 | ||
119 | %build | 120 | %build |
@@ -121,8 +122,6 @@ make %{?_smp_mflags} | @@ -121,8 +122,6 @@ make %{?_smp_mflags} | ||
121 | 122 | ||
122 | %install | 123 | %install |
123 | %make_install | 124 | %make_install |
124 | -# configure --disable-static has no effect | ||
125 | -rm -f %{buildroot}/%{_libdir}/*.a | ||
126 | 125 | ||
127 | %files -n %{name}-%{_libvrs} | 126 | %files -n %{name}-%{_libvrs} |
128 | %defattr(-,root,root) | 127 | %defattr(-,root,root) |
@@ -138,17 +137,22 @@ rm -f %{buildroot}/%{_libdir}/*.a | @@ -138,17 +137,22 @@ rm -f %{buildroot}/%{_libdir}/*.a | ||
138 | %{_libdir}/%{name}.so.%{MAJOR_VERSION} | 137 | %{_libdir}/%{name}.so.%{MAJOR_VERSION} |
139 | %{_libdir}/%{name}.so.%{MAJOR_VERSION}.%{MINOR_VERSION} | 138 | %{_libdir}/%{name}.so.%{MAJOR_VERSION}.%{MINOR_VERSION} |
140 | 139 | ||
140 | +%{_datadir}/%{_product}/colors.conf | ||
141 | + | ||
142 | +%dir %{_datadir}/%{_product}/remap/ | ||
143 | +%{_datadir}/%{_product}/remap/*.xml | ||
144 | + | ||
141 | %files devel | 145 | %files devel |
142 | %defattr(-,root,root) | 146 | %defattr(-,root,root) |
143 | 147 | ||
144 | -%{_datadir}/pw3270/pot/*.pot | ||
145 | - | ||
146 | %{_libdir}/%{name}.so | 148 | %{_libdir}/%{name}.so |
147 | %{_libdir}/pkgconfig/*.pc | 149 | %{_libdir}/pkgconfig/*.pc |
148 | 150 | ||
149 | %{_includedir}/v3270.h | 151 | %{_includedir}/v3270.h |
150 | %{_includedir}/v3270 | 152 | %{_includedir}/v3270 |
151 | 153 | ||
154 | +%{_datadir}/%{_product}/pot/*.pot | ||
155 | + | ||
152 | %files -n glade-catalog-v3270 | 156 | %files -n glade-catalog-v3270 |
153 | %defattr(-,root,root) | 157 | %defattr(-,root,root) |
154 | %{_datadir}/glade/ | 158 | %{_datadir}/glade/ |