Download as
Browse Code »

Commit 46e9f1f69ddc543699728f33aecfba174caf1b17

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

Atualizando empacotamento

Showing 2 changed files with 5 additions and 4 deletions   Show diff stats
@@ -175,13 +175,13 @@ bz2: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 @@ -175,13 +175,13 @@ bz2: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
175 rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 175 rpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
176 ifneq ($(RPMBUILD),no) 176 ifneq ($(RPMBUILD),no)
177 @$(MKDIR) $(PWD)/$(TMPDIR)/rpmbuild 177 @$(MKDIR) $(PWD)/$(TMPDIR)/rpmbuild
178 - @TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild rpmbuild -ta --clean $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 178 + @TMPDIR=$(PWD)/$(TMPDIR)/rpmbuild $(RPMBUILD) --define="_sourcedir $(PWD)" -ba --clean $(PACKAGE_TARNAME).spec
179 @rm -fr $(PWD)/$(TMPDIR)/rpmbuild 179 @rm -fr $(PWD)/$(TMPDIR)/rpmbuild
180 endif 180 endif
181 181
182 -srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz 182 +srpm: $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
183 ifneq ($(RPMBUILD),no) 183 ifneq ($(RPMBUILD),no)
184 - @rpmbuild -ts $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz 184 + @$(RPMBUILD) --define="_srcrpmdir $(PWD)" -bs $(PACKAGE_TARNAME).spec
185 endif 185 endif
186 186
187 $(PACKAGE_NAME).po: $(TMPDIR)/$(PACKAGE_NAME).pot 187 $(PACKAGE_NAME).po: $(TMPDIR)/$(PACKAGE_NAME).pot
@@ -202,7 +202,7 @@ pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png @@ -202,7 +202,7 @@ pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png
202 202
203 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist 203 $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist
204 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 204 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
205 - @find src -name Makefile -exec rm -f {} \; 205 +# @find src -name Makefile -exec rm -f {} \;
206 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 206 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
207 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 207 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
208 @NOCONFIGURE=1 ./autogen.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 208 @NOCONFIGURE=1 ./autogen.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
pw3270.spec.in
  Diff comments   View file @46e9f1f
@@ -137,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT @@ -137,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT
137 %files -f langfiles 137 %files -f langfiles
138 %defattr(-,root,root) 138 %defattr(-,root,root)
139 %doc AUTHORS LICENSE 139 %doc AUTHORS LICENSE
  140 +%{_mandir}/*/*
140 141
141 # Main application 142 # Main application
142 %dir %{_datadir}/@PACKAGE_NAME@ 143 %dir %{_datadir}/@PACKAGE_NAME@