From 4288039a11999c294260e185a87f136a931ac1ac Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Wed, 14 Mar 2012 21:05:43 +0000
Subject: [PATCH] Acertando empacotamento pelo suse build service

---
 configure.ac            |  39 ++++++++++++++++++++++++++++++---------
 pw3270.cbp              | 293 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------
 pw3270.spec.in          |  11 +++++++++--
 src/lib3270/Makefile.in |   2 +-
 4 files changed, 187 insertions(+), 158 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6c19b7c..8cfa588 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,7 @@ AC_SUBST(PACKAGE_REVISION, "SVN_REV")
 
 #--[ Set host based options ]---------------------------------------------------------------------------------------------------------------------------------
 
+DLL_CFLAGS=""
 DLL_FLAGS="-shared -Wl,-soname,\$(@F)"
 SOCKET_LIBS=""
 
@@ -83,7 +84,6 @@ OBJEXT=".o"
 EXEEXT=""
 DLLPREFIX="lib"
 
-
 if test $host != $build; then
 	AC_CHECK_PROGS(HOST_CC, gcc cc)
 else
@@ -103,14 +103,6 @@ case "$host" in
 
 esac
 
-
-AC_SUBST(HOST_CC)
-AC_SUBST(EXEEXT)
-AC_SUBST(DLLPREFIX)
-AC_SUBST(DLLEXT)
-AC_SUBST(DLL_FLAGS)
-AC_SUBST(SOCKET_LIBS)
-
 #--[ Debug/Release ]------------------------------------------------------------------------------------------------------------------------------------------
 
 DBG_LDFLAGS="-L.bin/Debug/lib"
@@ -173,6 +165,35 @@ if test $app_cv_fvisibility_ok = yes; then
   CFLAGS="$CFLAGS -fvisibility=hidden"
 fi
 
+#--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------
+
+AC_ARG_ENABLE([pic],
+	[AS_HELP_STRING([--enable-pic], [enable support for PIC libraries (required to compile PW3270 on some systems)])],
+[
+	app_cv_pic="$enableval"
+],[
+
+	if test "$host_cpu" = "x86_64"; then
+		app_cv_pic="yes"
+	else
+		app_cv_pic="no"
+	fi
+])
+
+if test "$app_cv_pic" == "yes"; then
+	DLL_CFLAGS="$DLL_CFLAGS -fPIC"
+fi
+
+#--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
+
+AC_SUBST(HOST_CC)
+AC_SUBST(EXEEXT)
+AC_SUBST(DLLPREFIX)
+AC_SUBST(DLLEXT)
+AC_SUBST(DLL_FLAGS)
+AC_SUBST(DLL_CFLAGS)
+AC_SUBST(SOCKET_LIBS)
+
 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
 
 AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?]))
diff --git a/pw3270.cbp b/pw3270.cbp
index 9e93dba..92eee83 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -8,8 +8,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Debug/" />
+				<Option output=".bin\Debug\pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Debug\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -18,8 +18,8 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output=".bin/Release/pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Release/" />
+				<Option output=".bin\Release\pw3270" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj\Release\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -33,280 +33,281 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`pkg-config gtk+-3.0 lib3270 --cflags`" />
-			<Add directory="src/include" />
+			<Add directory="src\include" />
 		</Compiler>
 		<Linker>
 			<Add option="`pkg-config gtk+-3.0 lib3270 --libs`" />
 		</Linker>
 		<Unit filename="Makefile.in" />
 		<Unit filename="configure.ac" />
-		<Unit filename="src/gtk/Makefile.in" />
-		<Unit filename="src/gtk/actions.c">
+		<Unit filename="pw3270.spec.in" />
+		<Unit filename="src\gtk\Makefile.in" />
+		<Unit filename="src\gtk\actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/common/common.h" />
-		<Unit filename="src/gtk/common/config.c">
+		<Unit filename="src\gtk\common\common.h" />
+		<Unit filename="src\gtk\common\config.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/fonts.c">
+		<Unit filename="src\gtk\fonts.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/globals.h" />
-		<Unit filename="src/gtk/main.c">
+		<Unit filename="src\gtk\globals.h" />
+		<Unit filename="src\gtk\main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/mainwindow.c">
+		<Unit filename="src\gtk\mainwindow.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/Makefile.in" />
-		<Unit filename="src/gtk/uiparser/accelerator.c">
+		<Unit filename="src\gtk\uiparser\Makefile.in" />
+		<Unit filename="src\gtk\uiparser\accelerator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/action.c">
+		<Unit filename="src\gtk\uiparser\action.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/menu.c">
+		<Unit filename="src\gtk\uiparser\menu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/menubar.c">
+		<Unit filename="src\gtk\uiparser\menubar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/menuitem.c">
+		<Unit filename="src\gtk\uiparser\menuitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/parsefile.c">
+		<Unit filename="src\gtk\uiparser\parsefile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/parser.c">
+		<Unit filename="src\gtk\uiparser\parser.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/parser.h" />
-		<Unit filename="src/gtk/uiparser/popup.c">
+		<Unit filename="src\gtk\uiparser\parser.h" />
+		<Unit filename="src\gtk\uiparser\popup.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/private.h" />
-		<Unit filename="src/gtk/uiparser/script.c">
+		<Unit filename="src\gtk\uiparser\private.h" />
+		<Unit filename="src\gtk\uiparser\script.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/separator.c">
+		<Unit filename="src\gtk\uiparser\separator.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/sources.mak" />
-		<Unit filename="src/gtk/uiparser/testprogram.c">
+		<Unit filename="src\gtk\uiparser\sources.mak" />
+		<Unit filename="src\gtk\uiparser\testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/toolbar.c">
+		<Unit filename="src\gtk\uiparser\toolbar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/uiparser/toolitem.c">
+		<Unit filename="src\gtk\uiparser\toolitem.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/clipboard.c">
+		<Unit filename="src\gtk\v3270\clipboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/draw.c">
+		<Unit filename="src\gtk\v3270\draw.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/genmarshal" />
-		<Unit filename="src/gtk/v3270/iocallback.c">
+		<Unit filename="src\gtk\v3270\genmarshal" />
+		<Unit filename="src\gtk\v3270\iocallback.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/keyboard.c">
+		<Unit filename="src\gtk\v3270\keyboard.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/mouse.c">
+		<Unit filename="src\gtk\v3270\mouse.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/oia.c">
+		<Unit filename="src\gtk\v3270\oia.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/gtk/v3270/private.h" />
-		<Unit filename="src/gtk/v3270/sources.mak" />
-		<Unit filename="src/gtk/v3270/v3270.h" />
-		<Unit filename="src/gtk/v3270/widget.c">
+		<Unit filename="src\gtk\v3270\private.h" />
+		<Unit filename="src\gtk\v3270\sources.mak" />
+		<Unit filename="src\gtk\v3270\v3270.h" />
+		<Unit filename="src\gtk\v3270\widget.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/include/lib3270.h" />
-		<Unit filename="src/include/lib3270/action_table.h" />
-		<Unit filename="src/include/lib3270/actions.h" />
-		<Unit filename="src/include/lib3270/config.h.in" />
-		<Unit filename="src/include/lib3270/log.h" />
-		<Unit filename="src/include/lib3270/popup.h" />
-		<Unit filename="src/include/lib3270/selection.h" />
-		<Unit filename="src/include/lib3270/session.h" />
-		<Unit filename="src/include/pw3270.h" />
-		<Unit filename="src/include/rules.mak.in" />
-		<Unit filename="src/lib3270/3270ds.h" />
-		<Unit filename="src/lib3270/Makefile.in" />
-		<Unit filename="src/lib3270/X11keysym.h" />
-		<Unit filename="src/lib3270/XtGlue.c">
+		<Unit filename="src\include\lib3270.h" />
+		<Unit filename="src\include\lib3270\action_table.h" />
+		<Unit filename="src\include\lib3270\actions.h" />
+		<Unit filename="src\include\lib3270\config.h.in" />
+		<Unit filename="src\include\lib3270\log.h" />
+		<Unit filename="src\include\lib3270\popup.h" />
+		<Unit filename="src\include\lib3270\selection.h" />
+		<Unit filename="src\include\lib3270\session.h" />
+		<Unit filename="src\include\pw3270.h" />
+		<Unit filename="src\include\rules.mak.in" />
+		<Unit filename="src\lib3270\3270ds.h" />
+		<Unit filename="src\lib3270\Makefile.in" />
+		<Unit filename="src\lib3270\X11keysym.h" />
+		<Unit filename="src\lib3270\XtGlue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/actions.c">
+		<Unit filename="src\lib3270\actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/actionsc.h" />
-		<Unit filename="src/lib3270/ansi.c">
+		<Unit filename="src\lib3270\actionsc.h" />
+		<Unit filename="src\lib3270\ansi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ansic.h" />
-		<Unit filename="src/lib3270/api.h" />
-		<Unit filename="src/lib3270/apl.c">
+		<Unit filename="src\lib3270\ansic.h" />
+		<Unit filename="src\lib3270\api.h" />
+		<Unit filename="src\lib3270\apl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/aplc.h" />
-		<Unit filename="src/lib3270/appres.h" />
-		<Unit filename="src/lib3270/arpa_telnet.h" />
-		<Unit filename="src/lib3270/cg.h" />
-		<Unit filename="src/lib3270/charset.c">
+		<Unit filename="src\lib3270\aplc.h" />
+		<Unit filename="src\lib3270\appres.h" />
+		<Unit filename="src\lib3270\arpa_telnet.h" />
+		<Unit filename="src\lib3270\cg.h" />
+		<Unit filename="src\lib3270\charset.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/charsetc.h" />
-		<Unit filename="src/lib3270/childc.h" />
-		<Unit filename="src/lib3270/ctlr.c">
+		<Unit filename="src\lib3270\charsetc.h" />
+		<Unit filename="src\lib3270\childc.h" />
+		<Unit filename="src\lib3270\ctlr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ctlr.h" />
-		<Unit filename="src/lib3270/ctlrc.h" />
-		<Unit filename="src/lib3270/dialogc.h" />
-		<Unit filename="src/lib3270/fallbacks.c">
+		<Unit filename="src\lib3270\ctlr.h" />
+		<Unit filename="src\lib3270\ctlrc.h" />
+		<Unit filename="src\lib3270\dialogc.h" />
+		<Unit filename="src\lib3270\fallbacks.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft.c">
+		<Unit filename="src\lib3270\ft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_cut.c">
+		<Unit filename="src\lib3270\ft_cut.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_cut_ds.h" />
-		<Unit filename="src/lib3270/ft_cutc.h" />
-		<Unit filename="src/lib3270/ft_dft.c">
+		<Unit filename="src\lib3270\ft_cut_ds.h" />
+		<Unit filename="src\lib3270\ft_cutc.h" />
+		<Unit filename="src\lib3270\ft_dft.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/ft_dft_ds.h" />
-		<Unit filename="src/lib3270/ft_dftc.h" />
-		<Unit filename="src/lib3270/ftc.h" />
-		<Unit filename="src/lib3270/globals.h" />
-		<Unit filename="src/lib3270/glue.c">
+		<Unit filename="src\lib3270\ft_dft_ds.h" />
+		<Unit filename="src\lib3270\ft_dftc.h" />
+		<Unit filename="src\lib3270\ftc.h" />
+		<Unit filename="src\lib3270\globals.h" />
+		<Unit filename="src\lib3270\glue.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/gluec.h" />
-		<Unit filename="src/lib3270/host.c">
+		<Unit filename="src\lib3270\gluec.h" />
+		<Unit filename="src\lib3270\host.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/hostc.h" />
-		<Unit filename="src/lib3270/icmdc.h" />
-		<Unit filename="src/lib3270/keypadc.h" />
-		<Unit filename="src/lib3270/kybd.c">
+		<Unit filename="src\lib3270\hostc.h" />
+		<Unit filename="src\lib3270\icmdc.h" />
+		<Unit filename="src\lib3270\keypadc.h" />
+		<Unit filename="src\lib3270\kybd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/kybdc.h" />
-		<Unit filename="src/lib3270/localdefs.h" />
-		<Unit filename="src/lib3270/log.c">
+		<Unit filename="src\lib3270\kybdc.h" />
+		<Unit filename="src\lib3270\localdefs.h" />
+		<Unit filename="src\lib3270\log.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/macros.c">
+		<Unit filename="src\lib3270\macros.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/mkfb.c">
+		<Unit filename="src\lib3270\mkfb.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/objects.h" />
-		<Unit filename="src/lib3270/paste.c">
+		<Unit filename="src\lib3270\objects.h" />
+		<Unit filename="src\lib3270\paste.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/popupsc.h" />
-		<Unit filename="src/lib3270/print.c">
+		<Unit filename="src\lib3270\popupsc.h" />
+		<Unit filename="src\lib3270\print.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/printc.h" />
-		<Unit filename="src/lib3270/printer.c">
+		<Unit filename="src\lib3270\printc.h" />
+		<Unit filename="src\lib3270\printer.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/printerc.h" />
-		<Unit filename="src/lib3270/proxy.c">
+		<Unit filename="src\lib3270\printerc.h" />
+		<Unit filename="src\lib3270\proxy.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/proxyc.h" />
-		<Unit filename="src/lib3270/resolver.c">
+		<Unit filename="src\lib3270\proxyc.h" />
+		<Unit filename="src\lib3270\resolver.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/resolverc.h" />
-		<Unit filename="src/lib3270/resources.c">
+		<Unit filename="src\lib3270\resolverc.h" />
+		<Unit filename="src\lib3270\resources.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/resources.h" />
-		<Unit filename="src/lib3270/rpq.c">
+		<Unit filename="src\lib3270\resources.h" />
+		<Unit filename="src\lib3270\rpq.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/savec.h" />
-		<Unit filename="src/lib3270/screen.c">
+		<Unit filename="src\lib3270\savec.h" />
+		<Unit filename="src\lib3270\screen.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/screen.h" />
-		<Unit filename="src/lib3270/screenc.h" />
-		<Unit filename="src/lib3270/scrollc.h" />
-		<Unit filename="src/lib3270/see.c">
+		<Unit filename="src\lib3270\screen.h" />
+		<Unit filename="src\lib3270\screenc.h" />
+		<Unit filename="src\lib3270\scrollc.h" />
+		<Unit filename="src\lib3270\see.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/seec.h" />
-		<Unit filename="src/lib3270/selection.c">
+		<Unit filename="src\lib3270\seec.h" />
+		<Unit filename="src\lib3270\selection.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/sf.c">
+		<Unit filename="src\lib3270\sf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/sfc.h" />
-		<Unit filename="src/lib3270/shlobj_missing.h" />
-		<Unit filename="src/lib3270/statusc.h" />
-		<Unit filename="src/lib3270/tables.c">
+		<Unit filename="src\lib3270\sfc.h" />
+		<Unit filename="src\lib3270\shlobj_missing.h" />
+		<Unit filename="src\lib3270\statusc.h" />
+		<Unit filename="src\lib3270\tables.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/tablesc.h" />
-		<Unit filename="src/lib3270/telnet.c">
+		<Unit filename="src\lib3270\tablesc.h" />
+		<Unit filename="src\lib3270\telnet.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/telnetc.h" />
-		<Unit filename="src/lib3270/testprogram.c">
+		<Unit filename="src\lib3270\telnetc.h" />
+		<Unit filename="src\lib3270\testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/tn3270e.h" />
-		<Unit filename="src/lib3270/toggle.h" />
-		<Unit filename="src/lib3270/toggles.c">
+		<Unit filename="src\lib3270\tn3270e.h" />
+		<Unit filename="src\lib3270\toggle.h" />
+		<Unit filename="src\lib3270\toggles.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/togglesc.h" />
-		<Unit filename="src/lib3270/trace_ds.c">
+		<Unit filename="src\lib3270\togglesc.h" />
+		<Unit filename="src\lib3270\trace_ds.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/trace_dsc.h" />
-		<Unit filename="src/lib3270/utf8.c">
+		<Unit filename="src\lib3270\trace_dsc.h" />
+		<Unit filename="src\lib3270\utf8.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/utf8c.h" />
-		<Unit filename="src/lib3270/util.c">
+		<Unit filename="src\lib3270\utf8c.h" />
+		<Unit filename="src\lib3270\util.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/utilc.h" />
-		<Unit filename="src/lib3270/version.c">
+		<Unit filename="src\lib3270\utilc.h" />
+		<Unit filename="src\lib3270\version.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/w3misc.c">
+		<Unit filename="src\lib3270\w3misc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/w3miscc.h" />
-		<Unit filename="src/lib3270/widec.h" />
-		<Unit filename="src/lib3270/winvers.c">
+		<Unit filename="src\lib3270\w3miscc.h" />
+		<Unit filename="src\lib3270\widec.h" />
+		<Unit filename="src\lib3270\winvers.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/winversc.h" />
-		<Unit filename="src/lib3270/xio.c">
+		<Unit filename="src\lib3270\winversc.h" />
+		<Unit filename="src\lib3270\xio.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/lib3270/xioc.h" />
-		<Unit filename="src/lib3270/xl.h" />
-		<Unit filename="ui/00default.xml" />
-		<Unit filename="ui/99debug.xml" />
+		<Unit filename="src\lib3270\xioc.h" />
+		<Unit filename="src\lib3270\xl.h" />
+		<Unit filename="ui\00default.xml" />
+		<Unit filename="ui\99debug.xml" />
 		<Unit filename="valgrind.suppression" />
 		<Extensions>
 			<code_completion />
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 643739e..2a1e32c 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -57,10 +57,10 @@ License:        LGPL
 Group:          System/X11/Terminals
 Version:        @PACKAGE_VERSION@
 Release:        %_release
-Summary:        IBM 3270 Terminal emulator for gtk.
+Summary:        IBM 3270 Terminal emulator for gtk
 Source:         %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       openssl shared-mime-info libgnome libgnomeui
+Requires:       openssl shared-mime-info
 Distribution:    %_distro
 BuildRequires:  autoconf automake gcc-c++ sed pkgconfig gtk2-devel libgnome-devel gettext-devel libopenssl-devel findutils
 
@@ -98,7 +98,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS LICENSE
+
+# Library
 %{_libdir}/lib3270.so
+
+# Main application
+%dir %{_datadir}/@PACKAGE_NAME@
+%dir %{_datadir}/@PACKAGE_NAME@/ui
+
 %{_bindir}/@PACKAGE_NAME@
 %{_datadir}/@PACKAGE_NAME@/ui/00default.xml
 %{_datadir}/@PACKAGE_NAME@/ui/99debug.xml
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index a5ad87f..7b255ea 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -28,7 +28,7 @@
 
 PACKAGE=@PACKAGE_NAME@
 
-CFLAGS=@CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include
+CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include
 SSL_CFLAGS=@LIBSSL_CFLAGS@
 
 DLL_FLAGS=@DLL_FLAGS@
--
libgit2 0.21.2