Download as
Browse Code »

Commit c5dbb5fa4def305d3623f6285f4100cfaf4c520b

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

Mudando compressor para bzip2 e ativando pic para todas as bibliotecas afim de r… 

…emover warnings do rpmlint
Showing 2 changed files with 20 additions and 6 deletions   Show diff stats
@@ -73,6 +73,17 @@ AMTAR=@AMTAR@ @@ -73,6 +73,17 @@ AMTAR=@AMTAR@
73 73
74 #---[ Rules ]------------------------------------------------------------------ 74 #---[ Rules ]------------------------------------------------------------------
75 75
  76 +%.tar.bz2: %.tar
  77 + @echo " GEN `basename $@`"
  78 + @bzip2 --compress -9 --stdout $< > $@
  79 + @chmod 666 $@
  80 +
  81 +%.tar.gz: %.tar
  82 + @echo " GEN `basename $@`"
  83 + @gzip -9 --stdout $< > $@
  84 + @chmod 666 $@
  85 +
  86 +
76 src/pw3270/%.png: src/pw3270/pixmaps/%.svg 87 src/pw3270/%.png: src/pw3270/pixmaps/%.svg
77 ifneq ($(CONVERT),no) 88 ifneq ($(CONVERT),no)
78 @echo " GEN `basename $@`" 89 @echo " GEN `basename $@`"
@@ -158,10 +169,12 @@ endif @@ -158,10 +169,12 @@ endif
158 169
159 tgz: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz 170 tgz: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
160 171
161 -rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz 172 +bz2: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
  173 +
  174 +rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
162 ifneq ($(RPMBUILD),no) 175 ifneq ($(RPMBUILD),no)
163 @$(MKDIR) $(PWD)/$(TMPDIR)/rpmbuild 176 @$(MKDIR) $(PWD)/$(TMPDIR)/rpmbuild
164 - @TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild rpmbuild -ta --clean $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz 177 + @TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild rpmbuild -ta --clean $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
165 @rm -fr $(PWD)/$(TMPDIR)/rpmbuild 178 @rm -fr $(PWD)/$(TMPDIR)/rpmbuild
166 endif 179 endif
167 180
@@ -186,7 +199,7 @@ $(TMPDIR)/$(PACKAGE_NAME).pot: $(BINDIR)/pot/pw3270.pot $(BINDIR)/pot/lib3270.po @@ -186,7 +199,7 @@ $(TMPDIR)/$(PACKAGE_NAME).pot: $(BINDIR)/pot/pw3270.pot $(BINDIR)/pot/lib3270.po
186 199
187 pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png 200 pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png
188 201
189 -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean pixmaps 202 +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps
190 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 203 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
191 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 204 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
192 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 205 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@@ -205,7 +218,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean pixmaps @@ -205,7 +218,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean pixmaps
205 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po 218 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po
206 @cp po/*.po $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po 219 @cp po/*.po $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/po
207 220
208 - @$(AMTAR) --create --gzip --directory $(TMPDIR) --exclude-vcs --owner=root --group=root --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 221 + @$(AMTAR) --create --directory $(TMPDIR) --exclude-vcs --owner=root --group=root --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
209 222
210 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 223 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
211 @echo $@ 224 @echo $@
@@ -257,6 +270,7 @@ distclean: clean @@ -257,6 +270,7 @@ distclean: clean
257 @rm -f src/pw3270/uiparser/Makefile 270 @rm -f src/pw3270/uiparser/Makefile
258 @rm -fr autom4te.cache 271 @rm -fr autom4te.cache
259 @rm -f *.pc 272 @rm -f *.pc
  273 + @rm -f $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar*
260 274
261 @rm -f Makefile 275 @rm -f Makefile
262 276
pw3270.spec.in
  Diff comments   View file @c5dbb5f
@@ -67,7 +67,7 @@ Group: System/X11/Terminals @@ -67,7 +67,7 @@ Group: System/X11/Terminals
67 Version: @PACKAGE_VERSION@ 67 Version: @PACKAGE_VERSION@
68 Release: %_release 68 Release: %_release
69 Summary: IBM 3270 Terminal emulator for gtk 69 Summary: IBM 3270 Terminal emulator for gtk
70 -Source: %{name}-%{version}.tar.gz 70 +Source: %{name}-%{version}.tar.bz2
71 BuildRoot: %{_tmppath}/%{name}-%{version}-build 71 BuildRoot: %{_tmppath}/%{name}-%{version}-build
72 Requires: openssl shared-mime-info 72 Requires: openssl shared-mime-info
73 Distribution: %_distro 73 Distribution: %_distro
@@ -117,7 +117,7 @@ Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@ @@ -117,7 +117,7 @@ Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
117 find . -exec touch {} \; 117 find . -exec touch {} \;
118 aclocal 118 aclocal
119 autoconf 119 autoconf
120 -./configure --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} 120 +./configure --enable-pic --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir}
121 121
122 %build 122 %build
123 make clean 123 make clean