Download as
Browse Code »

Commit 97036b41647a4aff856807608bf40b565388532f

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

Separando subpacotes

Showing 3 changed files with 46 additions and 12 deletions   Show diff stats
@@ -137,8 +137,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean $(PACKAGE_NAME).png $(PACKAG @@ -137,8 +137,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean $(PACKAGE_NAME).png $(PACKAG
137 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 137 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
138 @echo $@ 138 @echo $@
139 139
140 -install: $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png  
141 - @make BINRLS="../../.bin/Release/lib" -C src/lib3270 install 140 +install: install-sdk install-lib $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
142 @make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk install 141 @make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk install
143 142
144 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui 143 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
@@ -146,6 +145,16 @@ install: $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png @@ -146,6 +145,16 @@ install: $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
146 @$(INSTALL_DATA) $(PACKAGE_NAME).png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) 145 @$(INSTALL_DATA) $(PACKAGE_NAME).png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
147 @$(INSTALL_DATA) $(PACKAGE_NAME)-logo.png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) 146 @$(INSTALL_DATA) $(PACKAGE_NAME)-logo.png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
148 147
  148 +install-lib:
  149 + @make BINRLS="../../.bin/Release/lib" -C src/lib3270 install
  150 +
  151 +install-sdk:
  152 + @$(MKDIR) $(DESTDIR)$(includedir)/lib3270
  153 + @$(INSTALL_DATA) src/include/lib3270.h $(DESTDIR)/$(includedir)
  154 + @$(INSTALL_DATA) src/include/lib3270/config.h $(DESTDIR)/$(includedir)/lib3270
  155 + @$(INSTALL_DATA) src/include/lib3270/selection.h $(DESTDIR)/$(includedir)/lib3270
  156 + @$(INSTALL_DATA) src/include/pw3270.h $(DESTDIR)/$(includedir)/$(PACKAGE_NAME).h
  157 +
149 clean: 158 clean:
150 @rm -fr .obj 159 @rm -fr .obj
151 @rm -fr .bin 160 @rm -fr .bin
@@ -67,9 +67,6 @@ @@ -67,9 +67,6 @@
67 <Unit filename="src/gtk/main.c"> 67 <Unit filename="src/gtk/main.c">
68 <Option compilerVar="CC" /> 68 <Option compilerVar="CC" />
69 </Unit> 69 </Unit>
70 - <Unit filename="src/gtk/mainwindow.c">  
71 - <Option compilerVar="CC" />  
72 - </Unit>  
73 <Unit filename="src/gtk/print.c"> 70 <Unit filename="src/gtk/print.c">
74 <Option compilerVar="CC" /> 71 <Option compilerVar="CC" />
75 </Unit> 72 </Unit>
@@ -117,9 +114,6 @@ @@ -117,9 +114,6 @@
117 <Option compilerVar="CC" /> 114 <Option compilerVar="CC" />
118 </Unit> 115 </Unit>
119 <Unit filename="src/gtk/v3270/accessible.h" /> 116 <Unit filename="src/gtk/v3270/accessible.h" />
120 - <Unit filename="src/gtk/v3270/clipboard.c">  
121 - <Option compilerVar="CC" />  
122 - </Unit>  
123 <Unit filename="src/gtk/v3270/draw.c"> 117 <Unit filename="src/gtk/v3270/draw.c">
124 <Option compilerVar="CC" /> 118 <Option compilerVar="CC" />
125 </Unit> 119 </Unit>
@@ -137,12 +131,18 @@ @@ -137,12 +131,18 @@
137 <Option compilerVar="CC" /> 131 <Option compilerVar="CC" />
138 </Unit> 132 </Unit>
139 <Unit filename="src/gtk/v3270/private.h" /> 133 <Unit filename="src/gtk/v3270/private.h" />
  134 + <Unit filename="src/gtk/v3270/selection.c">
  135 + <Option compilerVar="CC" />
  136 + </Unit>
140 <Unit filename="src/gtk/v3270/sources.mak" /> 137 <Unit filename="src/gtk/v3270/sources.mak" />
141 <Unit filename="src/gtk/v3270/v3270.h" /> 138 <Unit filename="src/gtk/v3270/v3270.h" />
142 <Unit filename="src/gtk/v3270/widget.c"> 139 <Unit filename="src/gtk/v3270/widget.c">
143 <Option compilerVar="CC" /> 140 <Option compilerVar="CC" />
144 </Unit> 141 </Unit>
145 <Unit filename="src/gtk/valgrind.suppression" /> 142 <Unit filename="src/gtk/valgrind.suppression" />
  143 + <Unit filename="src/gtk/window.c">
  144 + <Option compilerVar="CC" />
  145 + </Unit>
146 <Unit filename="src/include/lib3270.h" /> 146 <Unit filename="src/include/lib3270.h" />
147 <Unit filename="src/include/lib3270/action_table.h" /> 147 <Unit filename="src/include/lib3270/action_table.h" />
148 <Unit filename="src/include/lib3270/actions.h" /> 148 <Unit filename="src/include/lib3270/actions.h" />
pw3270.spec.in
  Diff comments   View file @97036b4
@@ -70,6 +70,26 @@ any IBM host that supports 3270-style connections over TELNET. @@ -70,6 +70,26 @@ any IBM host that supports 3270-style connections over TELNET.
70 70
71 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ 71 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
72 72
  73 +%package lib
  74 +Summary: 3270 Communication library for %{name}
  75 +Group: Development/Libraries
  76 +Requires: openssl %{name}-lib
  77 +
  78 +%description lib
  79 +tn3270 protocol library for %{name}
  80 +
  81 +Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
  82 +
  83 +%package devel
  84 +Summary: Devel for 3270 Communication library for %{name}
  85 +Group: Development/Libraries
  86 +Requires: %{name}-lib = @PACKAGE_VERSION@
  87 +
  88 +%description devel
  89 +devel for tn3270 protocol library for %{name}
  90 +
  91 +Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
  92 +
73 #---[ Build & Install ]----------------------------------------------------------------------------------------------- 93 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
74 94
75 %prep 95 %prep
@@ -98,19 +118,24 @@ rm -rf $RPM_BUILD_ROOT @@ -98,19 +118,24 @@ rm -rf $RPM_BUILD_ROOT
98 %defattr(-,root,root) 118 %defattr(-,root,root)
99 %doc AUTHORS LICENSE 119 %doc AUTHORS LICENSE
100 120
101 -# Library  
102 -%{_libdir}/lib3270.so  
103 -  
104 # Main application 121 # Main application
105 %dir %{_datadir}/@PACKAGE_NAME@ 122 %dir %{_datadir}/@PACKAGE_NAME@
106 %dir %{_datadir}/@PACKAGE_NAME@/ui 123 %dir %{_datadir}/@PACKAGE_NAME@/ui
107 124
108 %{_bindir}/@PACKAGE_NAME@ 125 %{_bindir}/@PACKAGE_NAME@
109 %{_datadir}/@PACKAGE_NAME@/ui/00default.xml 126 %{_datadir}/@PACKAGE_NAME@/ui/00default.xml
110 -%{_datadir}/@PACKAGE_NAME@/ui/99debug.xml  
111 %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@.png 127 %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@.png
112 %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@-logo.png 128 %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@-logo.png
113 129
  130 +%files lib
  131 +%defattr(-,root,root)
  132 +%{_libdir}/lib3270.so
  133 +
  134 +%files devel
  135 +%defattr(-,root,root)
  136 +%{_includedir}
  137 +%{_datadir}/@PACKAGE_NAME@/ui/99debug.xml
  138 +
114 #---[ Scripts ]------------------------------------------------------------------------------------------------------- 139 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
115 140
116 %post 141 %post