Fixing 'deb' builds, small adjustment in the entry tool.

Perry Werneck
1 parent 03ced09f
Showing 4 changed files with 24 additions and 18 deletions Show diff stats
debian/rules
rpm/_service
rpm/libv3270.spec
src/tools/entry.c
@@ -6,7 +6,7 @@
 export DH_VERBOSE=1
  
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=9	
+export DH_COMPAT=9
  
 # Name of the package
 PACKAGE_NAME=libv3270
@@ -23,12 +23,7 @@ build-stamp:
 	dh_testdir
  
 	# Add here commands to compile the package.
-	aclocal
-	autoconf
-    
-	mkdir -p scripts
-	automake --add-missing 2> /dev/null | true
-    
+	NOCONFIGURE=1 ./autogen.sh 
 	./configure --prefix=/usr
 	make all
 	# --- end custom part for compiling
@@ -41,11 +41,11 @@
 		<param name="outfilename">debian.control</param>
 	</service>
  
-	<service name="extract_file">
+	<!-- service name="extract_file">
 		<param name="archive">*.tar</param>
 		<param name="files">*/debian/rules</param>
 		<param name="outfilename">debian.rules</param>
-	</service>
+	</service -->
  
   	<service name="extract_file">
 		<param name="archive">*.tar</param>
@@ -29,15 +29,14 @@ BuildRequires:  autoconf &gt;= 2.61
 BuildRequires:  automake
 BuildRequires:  binutils
 BuildRequires:  coreutils
+BuildRequires:  libtool
 BuildRequires:  gcc-c++
 BuildRequires:  gettext-devel
 BuildRequires:  m4
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(lib3270) >= 5.4
-%if 0%{?centos_version}
-# CENTOS Genmarshal doesn't depend on python!
-BuildRequires:  python
-%endif
+
+Suggests:       %{name}-config
  
 %description
  
@@ -60,6 +59,16 @@ provides a TN3270 virtual terminal widget for GTK 3.
  
 For more details, see https://softwarepublico.gov.br/social/pw3270/ .
  
+%package config
+Summary:    Configuration files for the 3270 Virtual Terminal library
+BuildArch:  noarch
+Requires:   %{name}-%{_libvrs} = %{version}
+Enhances:   %{_product}
+Conflicts:  libv3270-5_3
+
+%description config
+Originally designed as part of the pw3270 application, this package provides the configuration files required to %{name}.
+
 %package devel
 Summary:    Header files for the 3270 Virtual Terminal library
 Requires:   %{name}-%{_libvrs} = %{version}
@@ -78,22 +87,24 @@ widgets in Glade.
 %prep
 %setup -q
 NOCONFIGURE=1 ./autogen.sh
-%configure --with-release=%{release}
+%configure --with-release=%{release} --disable-static
  
 %build
 make all %{?_smp_mflags}
  
 %install
 %make_install
-%find_lang %{name} langfiles
+%find_lang %{name}-%{MAJOR_VERSION}.%{MINOR_VERSION} langfiles
  
 %files -n %{name}-%{_libvrs} -f langfiles
 %license LICENSE
 %doc AUTHORS README.md
 %{_libdir}/%{name}.so.*
-%{_datadir}/%{_product}/colors.conf
+
+%files config
 %dir %{_datadir}/%{_product}/remap/
-%{_datadir}/%{_product}/remap/*.xml
+%config %{_datadir}/%{_product}/colors.conf
+%config %{_datadir}/%{_product}/remap/*.xml
  
 %files devel
 %{_datadir}/pw3270/pot/*.pot
@@ -140,7 +140,7 @@
  
  }
  
- LIB3270_EXPORT void gtk_entry_bind_to_filechooser(GtkWidget *widget, GtkFileChooserAction action, const gchar *title, const gchar *icon_name, const gchar *pattern, const gchar *name) {
+ LIB3270_EXPORT GtkWidget * gtk_entry_bind_to_filechooser(GtkWidget *widget, GtkFileChooserAction action, const gchar *title, const gchar *icon_name, const gchar *pattern, const gchar *name) {
  
 	gtk_entry_set_icon_from_icon_name(
 		GTK_ENTRY(widget),
...	...	@@ -6,7 +6,7 @@
6	6	export DH_VERBOSE=1
7	7
8	8	# This is the debhelper compatibility version to use.
9		-export DH_COMPAT=9
	9	+export DH_COMPAT=9
10	10
11	11	# Name of the package
12	12	PACKAGE_NAME=libv3270
...	...	@@ -23,12 +23,7 @@ build-stamp:
23	23	dh_testdir
24	24
25	25	# Add here commands to compile the package.
26		- aclocal
27		- autoconf
28		-
29		- mkdir -p scripts
30		- automake --add-missing 2> /dev/null \| true
31		-
	26	+ NOCONFIGURE=1 ./autogen.sh
32	27	./configure --prefix=/usr
33	28	make all
34	29	# --- end custom part for compiling
...	...
...	...	@@ -41,11 +41,11 @@
41	41	<param name="outfilename">debian.control</param>
42	42	</service>
43	43
44		- <service name="extract_file">
	44	+ <!-- service name="extract_file">
45	45	<param name="archive">*.tar</param>
46	46	<param name="files">*/debian/rules</param>
47	47	<param name="outfilename">debian.rules</param>
48		- </service>
	48	+ </service -->
49	49
50	50	<service name="extract_file">
51	51	<param name="archive">*.tar</param>
...	...
...	...	@@ -29,15 +29,14 @@ BuildRequires: autoconf >= 2.61
29	29	BuildRequires: automake
30	30	BuildRequires: binutils
31	31	BuildRequires: coreutils
	32	+BuildRequires: libtool
32	33	BuildRequires: gcc-c++
33	34	BuildRequires: gettext-devel
34	35	BuildRequires: m4
35	36	BuildRequires: pkgconfig(gtk+-3.0)
36	37	BuildRequires: pkgconfig(lib3270) >= 5.4
37		-%if 0%{?centos_version}
38		-# CENTOS Genmarshal doesn't depend on python!
39		-BuildRequires: python
40		-%endif
	38	+
	39	+Suggests: %{name}-config
41	40
42	41	%description
43	42
...	...	@@ -60,6 +59,16 @@ provides a TN3270 virtual terminal widget for GTK 3.
60	59
61	60	For more details, see https://softwarepublico.gov.br/social/pw3270/ .
62	61
	62	+%package config
	63	+Summary: Configuration files for the 3270 Virtual Terminal library
	64	+BuildArch: noarch
	65	+Requires: %{name}-%{_libvrs} = %{version}
	66	+Enhances: %{_product}
	67	+Conflicts: libv3270-5_3
	68	+
	69	+%description config
	70	+Originally designed as part of the pw3270 application, this package provides the configuration files required to %{name}.
	71	+
63	72	%package devel
64	73	Summary: Header files for the 3270 Virtual Terminal library
65	74	Requires: %{name}-%{_libvrs} = %{version}
...	...	@@ -78,22 +87,24 @@ widgets in Glade.
78	87	%prep
79	88	%setup -q
80	89	NOCONFIGURE=1 ./autogen.sh
81		-%configure --with-release=%{release}
	90	+%configure --with-release=%{release} --disable-static
82	91
83	92	%build
84	93	make all %{?_smp_mflags}
85	94
86	95	%install
87	96	%make_install
88		-%find_lang %{name} langfiles
	97	+%find_lang %{name}-%{MAJOR_VERSION}.%{MINOR_VERSION} langfiles
89	98
90	99	%files -n %{name}-%{_libvrs} -f langfiles
91	100	%license LICENSE
92	101	%doc AUTHORS README.md
93	102	%{_libdir}/%{name}.so.*
94		-%{_datadir}/%{_product}/colors.conf
	103	+
	104	+%files config
95	105	%dir %{_datadir}/%{_product}/remap/
96		-%{_datadir}/%{_product}/remap/*.xml
	106	+%config %{_datadir}/%{_product}/colors.conf
	107	+%config %{_datadir}/%{_product}/remap/*.xml
97	108
98	109	%files devel
99	110	%{_datadir}/pw3270/pot/*.pot
...	...
...	...	@@ -140,7 +140,7 @@
140	140
141	141	}
142	142
143		- LIB3270_EXPORT void gtk_entry_bind_to_filechooser(GtkWidget widget, GtkFileChooserAction action, const gchar title, const gchar icon_name, const gchar pattern, const gchar *name) {
	143	+ LIB3270_EXPORT GtkWidget * gtk_entry_bind_to_filechooser(GtkWidget widget, GtkFileChooserAction action, const gchar title, const gchar icon_name, const gchar pattern, const gchar *name) {
144	144
145	145	gtk_entry_set_icon_from_icon_name(
146	146	GTK_ENTRY(widget),
...	...