Commit 0825fa406ad60f883fa3529ba5375520d68733fd
1 parent
d1dd7855
Exists in
master
and in
5 other branches
Atualizando empacotamento
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
Makefile.in
| @@ -338,7 +338,7 @@ install-sdk: | @@ -338,7 +338,7 @@ install-sdk: | ||
| 338 | @$(MAKE) -C src/classlib install-sdk | 338 | @$(MAKE) -C src/classlib install-sdk |
| 339 | 339 | ||
| 340 | install-oxt: | 340 | install-oxt: |
| 341 | - @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt install | 341 | + @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/loffice install |
| 342 | 342 | ||
| 343 | install-plugin-rexx: | 343 | install-plugin-rexx: |
| 344 | @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install | 344 | @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install |
| @@ -358,7 +358,7 @@ clean: | @@ -358,7 +358,7 @@ clean: | ||
| 358 | @make -C src/plugins/hllapi clean | 358 | @make -C src/plugins/hllapi clean |
| 359 | @make -C src/plugins/rx3270 clean | 359 | @make -C src/plugins/rx3270 clean |
| 360 | @make -C src/plugins/dbus3270 clean | 360 | @make -C src/plugins/dbus3270 clean |
| 361 | - @make -C src/oxt clean | 361 | + @make -C src/loffice clean |
| 362 | @make -C src/classlib clean | 362 | @make -C src/classlib clean |
| 363 | @rm -f $(PACKAGE_NAME).png | 363 | @rm -f $(PACKAGE_NAME).png |
| 364 | @rm -f $(PACKAGE_NAME)-logo.png | 364 | @rm -f $(PACKAGE_NAME)-logo.png |
pw3270.spec.in
| @@ -44,7 +44,7 @@ | @@ -44,7 +44,7 @@ | ||
| 44 | %endif | 44 | %endif |
| 45 | 45 | ||
| 46 | %if %{?suse_version} >= 1310 | 46 | %if %{?suse_version} >= 1310 |
| 47 | - %define _office 0 | 47 | + %define _office 1 |
| 48 | %define _bldreq gtk3-devel libopenssl-devel ucpp | 48 | %define _bldreq gtk3-devel libopenssl-devel ucpp |
| 49 | %endif | 49 | %endif |
| 50 | %endif | 50 | %endif |
| @@ -257,7 +257,7 @@ rm -rf $RPM_BUILD_ROOT | @@ -257,7 +257,7 @@ rm -rf $RPM_BUILD_ROOT | ||
| 257 | %{_libdir}/libreoffice/share/extensions/%{name}/description.txt | 257 | %{_libdir}/libreoffice/share/extensions/%{name}/description.txt |
| 258 | %{_libdir}/libreoffice/share/extensions/%{name}/description.xml | 258 | %{_libdir}/libreoffice/share/extensions/%{name}/description.xml |
| 259 | %{_libdir}/libreoffice/share/extensions/%{name}/pw3270.png | 259 | %{_libdir}/libreoffice/share/extensions/%{name}/pw3270.png |
| 260 | -%{_libdir}/libreoffice/share/extensions/%{name}/pw3270.uno.rdb | 260 | +%{_libdir}/libreoffice/share/extensions/%{name}/pw3270.rdb |
| 261 | %{_libdir}/libreoffice/share/extensions/%{name}/pw3270.uno.so | 261 | %{_libdir}/libreoffice/share/extensions/%{name}/pw3270.uno.so |
| 262 | %endif | 262 | %endif |
| 263 | 263 |
src/loffice/Makefile.in
| @@ -160,7 +160,7 @@ install: $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \ | @@ -160,7 +160,7 @@ install: $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \ | ||
| 160 | @$(INSTALL_DATA) $(RDBDIR)/$(PACKAGE_NAME).rdb $(instdir) | 160 | @$(INSTALL_DATA) $(RDBDIR)/$(PACKAGE_NAME).rdb $(instdir) |
| 161 | 161 | ||
| 162 | @$(CONVERT) ../$(PACKAGE_NAME)/pixmaps/$(PACKAGE_NAME).svg --format=png > $(instdir)/$(PACKAGE_NAME).png | 162 | @$(CONVERT) ../$(PACKAGE_NAME)/pixmaps/$(PACKAGE_NAME).svg --format=png > $(instdir)/$(PACKAGE_NAME).png |
| 163 | - @chmod 644 $(instdir)/$(PACKAGE).png | 163 | + @chmod 644 $(instdir)/$(PACKAGE_NAME).png |
| 164 | 164 | ||
| 165 | $(BINDIR)/$(PACKAGE_NAME).oxt: \ | 165 | $(BINDIR)/$(PACKAGE_NAME).oxt: \ |
| 166 | $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \ | 166 | $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \ |