fix debuginfo

f41
David Tardon 12 years ago
parent 542cdfd10b
commit a23a2bf23a

@ -0,0 +1,26 @@
From 5155612a6e3a63d5b29fa3da522c2544dc6c8453 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 2 Nov 2012 10:06:46 +0100
Subject: [PATCH] do not strip install set
Change-Id: I68fb75cc35b96ecd8e4a56ef3d5304741f8a443a
---
instsetoo_native/util/makefile.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 7906d74..54e399d 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -244,7 +244,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!=""
openoffice_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -strip -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
--
1.7.11.7

@ -188,6 +188,7 @@ Patch24: 0003-drop-saxon-based-XSLT-transformer.patch
Patch25: 0004-remove-all-traces-of-saxon.patch Patch25: 0004-remove-all-traces-of-saxon.patch
Patch26: 0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch Patch26: 0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch
Patch27: 0001-fdo-47157-adding-Keywords-to-.desktop-files.patch Patch27: 0001-fdo-47157-adding-Keywords-to-.desktop-files.patch
Patch28: 0001-do-not-strip-install-set.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -810,7 +811,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch24 -p1 -b .drop-saxon-based-XSLT-transformer.patch %patch24 -p1 -b .drop-saxon-based-XSLT-transformer.patch
%patch25 -p1 -b .remove-all-traces-of-saxon.patch %patch25 -p1 -b .remove-all-traces-of-saxon.patch
%patch26 -p1 -b .rhbz865058-retard-overflow-of-internal-tabl.patch %patch26 -p1 -b .rhbz865058-retard-overflow-of-internal-tabl.patch
%patch27 -p1 -b .fdo-47157-adding-Keywords-to-.desktop-files.patch %patch27 -p1 -b .fdo-47157-adding-Keywords-to-.desktop-files.patch
%patch28 -p1 -b .do-not-strip-install-set.patch
# TODO: check this # TODO: check this
# these are horribly incomplete--empty translations and copied english # these are horribly incomplete--empty translations and copied english
@ -2039,8 +2041,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Thu Nov 01 2012 David Tardon <dtardon@redhat.com> - 1:3.6.3.2-4 * Fri Nov 02 2012 David Tardon <dtardon@redhat.com> - 1:3.6.3.2-4
- Resolves: rhbz#871929 add keywords to desktop files - Resolves: rhbz#871929 add keywords to desktop files
- fix debuginfo
* Wed Oct 31 2012 Eike Rathke <erack@redhat.com> - 1:3.6.3.2-3 * Wed Oct 31 2012 Eike Rathke <erack@redhat.com> - 1:3.6.3.2-3
- Resolves: rhbz#865058 increase number of user-defined format codes - Resolves: rhbz#865058 increase number of user-defined format codes

Loading…
Cancel
Save