From 0825fa406ad60f883fa3529ba5375520d68733fd Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Tue, 1 Apr 2014 16:15:43 +0000 Subject: [PATCH] Atualizando empacotamento --- Makefile.in | 4 ++-- pw3270.spec.in | 4 ++-- src/loffice/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6c85329..50fe8a9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -338,7 +338,7 @@ install-sdk: @$(MAKE) -C src/classlib install-sdk install-oxt: - @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt install + @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/loffice install install-plugin-rexx: @$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install @@ -358,7 +358,7 @@ clean: @make -C src/plugins/hllapi clean @make -C src/plugins/rx3270 clean @make -C src/plugins/dbus3270 clean - @make -C src/oxt clean + @make -C src/loffice clean @make -C src/classlib clean @rm -f $(PACKAGE_NAME).png @rm -f $(PACKAGE_NAME)-logo.png diff --git a/pw3270.spec.in b/pw3270.spec.in index 3a0e02f..457bd1a 100644 --- a/pw3270.spec.in +++ b/pw3270.spec.in @@ -44,7 +44,7 @@ %endif %if %{?suse_version} >= 1310 - %define _office 0 + %define _office 1 %define _bldreq gtk3-devel libopenssl-devel ucpp %endif %endif @@ -257,7 +257,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libreoffice/share/extensions/%{name}/description.txt %{_libdir}/libreoffice/share/extensions/%{name}/description.xml %{_libdir}/libreoffice/share/extensions/%{name}/pw3270.png -%{_libdir}/libreoffice/share/extensions/%{name}/pw3270.uno.rdb +%{_libdir}/libreoffice/share/extensions/%{name}/pw3270.rdb %{_libdir}/libreoffice/share/extensions/%{name}/pw3270.uno.so %endif diff --git a/src/loffice/Makefile.in b/src/loffice/Makefile.in index a3fe993..7102230 100644 --- a/src/loffice/Makefile.in +++ b/src/loffice/Makefile.in @@ -160,7 +160,7 @@ install: $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \ @$(INSTALL_DATA) $(RDBDIR)/$(PACKAGE_NAME).rdb $(instdir) @$(CONVERT) ../$(PACKAGE_NAME)/pixmaps/$(PACKAGE_NAME).svg --format=png > $(instdir)/$(PACKAGE_NAME).png - @chmod 644 $(instdir)/$(PACKAGE).png + @chmod 644 $(instdir)/$(PACKAGE_NAME).png $(BINDIR)/$(PACKAGE_NAME).oxt: \ $(BINRLS)/$(PACKAGE_NAME).uno@DLLEXT@ \ -- libgit2 0.21.2