Download as
Browse Code »

Commit 64608d1144be6e2030ff017550618f74ff63513a

Authored by perry.werneck@gmail.com
1 parent 9565aa3a
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo empacotamento em windows, ajustes para remoção de warnings do suse build service

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
pw3270.spec.in
  Diff comments   View file @64608d1
@@ -148,7 +148,6 @@ rm -rf $RPM_BUILD_ROOT @@ -148,7 +148,6 @@ rm -rf $RPM_BUILD_ROOT
148 %{_bindir}/@PACKAGE_NAME@ 148 %{_bindir}/@PACKAGE_NAME@
149 %{_libdir}/libpw3270.so.@MAJOR_VERSION@ 149 %{_libdir}/libpw3270.so.@MAJOR_VERSION@
150 %{_libdir}/libpw3270.so.@VERSION@ 150 %{_libdir}/libpw3270.so.@VERSION@
151 -%{_libdir}/libpw3270.so  
152 151
153 %{_datadir}/@PACKAGE_NAME@/ui/00default.xml 152 %{_datadir}/@PACKAGE_NAME@/ui/00default.xml
154 %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@.png 153 %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@.png
@@ -166,6 +165,7 @@ rm -rf $RPM_BUILD_ROOT @@ -166,6 +165,7 @@ rm -rf $RPM_BUILD_ROOT
166 %{_datadir}/@PACKAGE_NAME@/ui/99debug.xml 165 %{_datadir}/@PACKAGE_NAME@/ui/99debug.xml
167 %{_libdir}/pkgconfig/*.pc 166 %{_libdir}/pkgconfig/*.pc
168 %{_libdir}/lib3270.so 167 %{_libdir}/lib3270.so
  168 +%{_libdir}/libpw3270.so
169 169
170 #---[ Scripts ]------------------------------------------------------------------------------------------------------- 170 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
171 171
src/lib3270/proxy.c
  Diff comments   View file @64608d1
@@ -686,7 +686,7 @@ static int proxy_socks4(H3270 *hSession, int fd, char *host, unsigned short port @@ -686,7 +686,7 @@ static int proxy_socks4(H3270 *hSession, int fd, char *host, unsigned short port
686 popup_an_error(hSession,_("SOCKS4 Proxy: userid error")); 686 popup_an_error(hSession,_("SOCKS4 Proxy: userid error"));
687 return -1; 687 return -1;
688 default: 688 default:
689 - popup_an_error(hSession,_("SOCKS4 Proxy: unknown status 0x%02x",rbuf[1])); 689 + popup_an_error(hSession,_("SOCKS4 Proxy: unknown status 0x%02x"),rbuf[1]);
690 return -1; 690 return -1;
691 } 691 }
692 692
src/pw3270/Makefile.in
  Diff comments   View file @64608d1
@@ -119,7 +119,7 @@ $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_ @@ -119,7 +119,7 @@ $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_
119 $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) 119 $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT))
120 @echo " CCLD `basename $@`" 120 @echo " CCLD `basename $@`"
121 @$(MKDIR) `dirname $@` 121 @$(MKDIR) `dirname $@`
122 - @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) 122 + @$(LD) $(DLL_FLAGS) -Wl,-soname,@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS)
123 123
124 #---[ Debug targets ]---------------------------------------------------------- 124 #---[ Debug targets ]----------------------------------------------------------
125 125
@@ -138,7 +138,7 @@ $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_ @@ -138,7 +138,7 @@ $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_
138 $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) 138 $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT))
139 @echo " CCLD `basename $@`" 139 @echo " CCLD `basename $@`"
140 @$(MKDIR) `dirname $@` 140 @$(MKDIR) `dirname $@`
141 - @$(LD) $(DLL_FLAGS) $(LDFLAGS) -Wl,--rpath,.bin/Debug/lib -o $@ $^ $(LIBS) $(LIB3270_LIBS) 141 + @$(LD) $(DLL_FLAGS) -Wl,-soname,@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ $(LDFLAGS) -Wl,--rpath,.bin/Debug/lib -o $@ $^ $(LIBS) $(LIB3270_LIBS)
142 142
143 run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 143 run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
144 @cd "$(ROOTDIR)" ; .bin/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 144 @cd "$(ROOTDIR)" ; .bin/Debug/$(PACKAGE_TARNAME)$(EXEEXT)