Download as
Browse Code »

Commit e9d8d8d5bd6eaabbd4e51f5e8f0eadf7b7782121

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

Incluindo versionamento no nome da biblioteca

Showing 4 changed files with 24 additions and 9 deletions   Show diff stats
@@ -215,6 +215,7 @@ fi @@ -215,6 +215,7 @@ fi
215 215
216 #--[ Misc options ]------------------------------------------------------------------------------------------------------------------------------------------- 216 #--[ Misc options ]-------------------------------------------------------------------------------------------------------------------------------------------
217 217
  218 +AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)")
218 AC_SUBST(HOST_CC) 219 AC_SUBST(HOST_CC)
219 AC_SUBST(EXEEXT) 220 AC_SUBST(EXEEXT)
220 AC_SUBST(DLLPREFIX) 221 AC_SUBST(DLLPREFIX)
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2012-06-15 08:28-0300\n" 8 +"POT-Creation-Date: 2012-06-15 15:05-0300\n"
9 "PO-Revision-Date: 2012-05-28 15:51-0300\n" 9 "PO-Revision-Date: 2012-05-28 15:51-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português do Brasil <>\n" 11 "Language-Team: Português do Brasil <>\n"
@@ -314,7 +314,7 @@ msgstr &quot;Cancelado pelo usuário&quot; @@ -314,7 +314,7 @@ msgstr &quot;Cancelado pelo usuário&quot;
314 msgid "Cannot create socket handle" 314 msgid "Cannot create socket handle"
315 msgstr "Não foi possível criar um manipulador de socket" 315 msgstr "Não foi possível criar um manipulador de socket"
316 316
317 -#: session.c:306 317 +#: session.c:307
318 #, c-format 318 #, c-format
319 msgid "Cannot find charset \"%s\", using defaults" 319 msgid "Cannot find charset \"%s\", using defaults"
320 msgstr "Não encontrei codificação \"%s\", usando defaults" 320 msgstr "Não encontrei codificação \"%s\", usando defaults"
pw3270.spec.in
  Diff comments   View file @e9d8d8d
@@ -150,7 +150,8 @@ rm -rf $RPM_BUILD_ROOT @@ -150,7 +150,8 @@ rm -rf $RPM_BUILD_ROOT
150 150
151 %files -n lib3270 151 %files -n lib3270
152 %defattr(-,root,root) 152 %defattr(-,root,root)
153 -%{_libdir}/lib3270.so 153 +%{_libdir}/lib3270.so.@MAJOR_VERSION@
  154 +%{_libdir}/lib3270.so.@VERSION@
154 155
155 %files -n lib3270-devel 156 %files -n lib3270-devel
156 %defattr(-,root,root) 157 %defattr(-,root,root)
@@ -158,13 +159,15 @@ rm -rf $RPM_BUILD_ROOT @@ -158,13 +159,15 @@ rm -rf $RPM_BUILD_ROOT
158 %{_includedir}/lib3270 159 %{_includedir}/lib3270
159 %{_datadir}/@PACKAGE_NAME@/ui/99debug.xml 160 %{_datadir}/@PACKAGE_NAME@/ui/99debug.xml
160 %{_libdir}/pkgconfig/*.pc 161 %{_libdir}/pkgconfig/*.pc
  162 +%{_libdir}/lib3270.so
161 163
162 #---[ Scripts ]------------------------------------------------------------------------------------------------------- 164 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
163 165
164 -%post 166 +%post -n lib3270
  167 +/sbin/ldconfig
165 exit 0 168 exit 0
166 169
167 -%postun 170 +%postun -n lib3270
  171 +/sbin/ldconfig
168 exit 0 172 exit 0
169 173
170 -  
src/lib3270/Makefile.in
  Diff comments   View file @e9d8d8d
@@ -60,6 +60,7 @@ INSTALL_DATA=@INSTALL_DATA@ @@ -60,6 +60,7 @@ INSTALL_DATA=@INSTALL_DATA@
60 VALGRIND=@VALGRIND@ 60 VALGRIND=@VALGRIND@
61 XGETTEXT=@XGETTEXT@ 61 XGETTEXT=@XGETTEXT@
62 MSGCAT=@MSGCAT@ 62 MSGCAT=@MSGCAT@
  63 +LN_S=@LN_S@
63 64
64 #---[ ]------------------------------------------------------------------ 65 #---[ ]------------------------------------------------------------------
65 66
@@ -109,16 +110,26 @@ Release: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ @@ -109,16 +110,26 @@ Release: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@
109 110
110 install: Release 111 install: Release
111 @$(MKDIR) $(DESTDIR)$(libdir) 112 @$(MKDIR) $(DESTDIR)$(libdir)
112 - @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ $(DESTDIR)$(libdir) 113 + @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)
  114 + @$(LN_S) @DLLPREFIX@3270@DLLEXT@.@VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@
  115 + @$(LN_S) @DLLPREFIX@3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/@DLLPREFIX@3270@DLLEXT@
113 116
114 Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ 117 Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@
115 118
116 -$(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) 119 +$(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@.@VERSION@
  120 + @rm -f $@
  121 + @cd $(BINDBG) && $(LN_S) @DLLPREFIX@3270@DLLEXT@.@VERSION@ @DLLPREFIX@3270@DLLEXT@
  122 +
  123 +$(BINDBG)/@DLLPREFIX@3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
117 @echo " CCLD `basename $@`" 124 @echo " CCLD `basename $@`"
118 @$(MKDIR) `dirname $@` 125 @$(MKDIR) `dirname $@`
119 @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) 126 @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
120 127
121 -$(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) 128 +$(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@
  129 + @rm -f $@
  130 + @cd $(BINRLS) && $(LN_S) @DLLPREFIX@3270@DLLEXT@.@VERSION@ @DLLPREFIX@3270@DLLEXT@
  131 +
  132 +$(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@)
122 @echo " CCLD `basename $@`" 133 @echo " CCLD `basename $@`"
123 @$(MKDIR) `dirname $@` 134 @$(MKDIR) `dirname $@`
124 @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) 135 @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)