From df56ae3a9ced0a63b5a72c32a680d45550146a3da9f6db2bfe5d70cf9f0219ae Mon Sep 17 00:00:00 2001 From: Mikhail Terekhov Date: Sat, 6 May 2017 16:06:53 +0000 Subject: [PATCH] Accepting request 493107 from home:jengelh:branches:devel:languages:pascal - Avoid bashisms in %prep. Escape call involving "!" with single quotes to really be sure that there is no history expansion. OBS-URL: https://build.opensuse.org/request/show/493107 OBS-URL: https://build.opensuse.org/package/show/devel:languages:pascal/lazarus?expand=0&rev=38 --- lazarus.changes | 6 ++++++ lazarus.spec | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lazarus.changes b/lazarus.changes index a05073f..ac32b89 100644 --- a/lazarus.changes +++ b/lazarus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 5 22:07:06 UTC 2017 - jengelh@inai.de + +- Avoid bashisms in %prep. Escape call involving "!" with single + quotes to really be sure that there is no history expansion. + ------------------------------------------------------------------- Tue May 2 04:56:49 UTC 2017 - bwiedemann@suse.com diff --git a/lazarus.spec b/lazarus.spec index c71e861..8587b4b 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -1,8 +1,7 @@ # # spec file for package lazarus # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2008-2009 oc2pus +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,10 +20,10 @@ Name: lazarus Version: 1.6.2 Release: 0 # Please note that the LGPL is modified and this is not multi-licensed, but each component has a separate license chosen. -License: GPL-2.0 and LGPL-2.0 and MPL-1.1 Summary: FreePascal RAD IDE and Component Library -Url: http://www.lazarus.freepascal.org/ +License: GPL-2.0 and LGPL-2.0 and MPL-1.1 Group: Development/Languages/Other +Url: http://www.lazarus.freepascal.org/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-0.tar.gz # PATCH-FEATURE-UPSTREAM http://mantis.freepascal.org/view.php?id=31364 Source1: https://raw.githubusercontent.com/hughsie/fedora-appstream/developerapps/appdata-extra/desktop/lazarus.appdata.xml @@ -108,9 +107,9 @@ dos2unix examples/trayicon/wndtray.* chmod 644 docs/booth/ProdProgEntwMitOpenSourceSystems2007.odp if [[ $SOURCE_DATE_EPOCH ]] ; then datestr=$(date -u "-d@$SOURCE_DATE_EPOCH" +%Y/%m/%d) - sed -i -e "s!{\$I %%date%%}!'$datestr'!" \ + sed -i -e 's!{\$I %%date%%}!'"'$datestr'"'!' \ ide/ideinfodlg.pas ide/aboutfrm.pas ide/idefpcinfo.pas - touch -d@$SOURCE_DATE_EPOCH ide/ideinfodlg.pas ide/aboutfrm.pas ide/idefpcinfo.pas # reset source timestamps because they are embedded in compiled files + touch -d@"$SOURCE_DATE_EPOCH" ide/ideinfodlg.pas ide/aboutfrm.pas ide/idefpcinfo.pas # reset source timestamps because they are embedded in compiled files fi %build