From 05143861c881d072458051a9464d1bceb465f26c Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 9 Jun 2017 22:10:39 +0000 Subject: [PATCH] rpm: fixed omitting editoroptions.xml git-svn-id: trunk@55295 - --- tools/install/debian_lazarus/conffiles | 2 +- tools/install/rpm/lazarus.spec.template | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/install/debian_lazarus/conffiles b/tools/install/debian_lazarus/conffiles index d5df2d4ed4..1799760aec 100644 --- a/tools/install/debian_lazarus/conffiles +++ b/tools/install/debian_lazarus/conffiles @@ -1,2 +1,2 @@ /etc/lazarus/environmentoptions.xml -/etc/lazarus/editoroptions.xml + diff --git a/tools/install/rpm/lazarus.spec.template b/tools/install/rpm/lazarus.spec.template index e230d5dbda..d9c05552fe 100644 --- a/tools/install/rpm/lazarus.spec.template +++ b/tools/install/rpm/lazarus.spec.template @@ -69,7 +69,6 @@ ln -sf $LAZARUSDIR/lazbuild %{buildroot}%{_bindir}/lazbuild cat lazarus/install/man/man1/lazbuild.1 | gzip > %{buildroot}%{_mandir}/man1/lazbuild.1.gz cat lazarus/install/man/man1/lazarus-ide.1 | gzip > %{buildroot}%{_mandir}/man1/lazarus-ide.1.gz cat lazarus/install/man/man1/startlazarus.1 | gzip > %{buildroot}%{_mandir}/man1/startlazarus.1.gz - install lazarus/tools/install/linux/editoroptions.xml %{buildroot}%{_sysconfdir}/lazarus/editoroptions.xml cat lazarus/tools/install/linux/environmentoptions.xml | sed -e "s#__LAZARUSDIR__#$LAZARUSDIR/#" -e "s#__FPCSRCDIR__#%{_datadir}/fpcsrc/#" > %{buildroot}%{_sysconfdir}/lazarus/environmentoptions.xml @@ -90,7 +89,6 @@ update-desktop-database &> /dev/null ||: %{_datadir}/pixmaps/lazarus.png %{_datadir}/applications/lazarus.desktop %{_datadir}/mime/packages/lazarus.xml - %{_sysconfdir}/lazarus/editoroptions.xml %{_sysconfdir}/lazarus/environmentoptions.xml %{_mandir}/*/*