diff --git a/lazarus.changes b/lazarus.changes index 0da0598..c1591fd 100644 --- a/lazarus.changes +++ b/lazarus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 26 15:18:15 UTC 2017 - jengelh@inai.de + +- Remove bashsisms from %prep. Replace useless use of cat. + Fix unusual BuildRequires for sles>=11. + Trim filler wording from description. + ------------------------------------------------------------------- Sun Dec 17 17:44:17 UTC 2017 - aloisio@gmx.com diff --git a/lazarus.spec b/lazarus.spec index 1b764c2..acf93f5 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -45,7 +45,7 @@ BuildRequires: fpc-src >= 3.0.0 %if 0%{?suse_version} >= 1140 BuildRequires: hicolor-icon-theme %endif -%if 0%{?sles_version} >= 11 +%if 0%{?sles_version} == 11 BuildRequires: glib2-devel BuildRequires: gtk2-devel %else @@ -62,7 +62,7 @@ BuildRequires: pkgconfig(Qt5X11Extras) Requires: fpc Requires: fpc-src Requires: gdb -%if 0%{?sles_version} >= 11 +%if 0%{?sles_version} == 11 Requires: glib2-devel Requires: gtk2-devel %else @@ -76,7 +76,7 @@ Requires(postun): shared-mime-info BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Lazarus is a free and open source Rapid Application Development +Lazarus is a Rapid Application Development tool for the FreePascal compiler using the Lazarus component library - LCL. The LCL is included in this package. @@ -129,7 +129,7 @@ dos2unix examples/trayicon/wndtray.* # fix rpmlint error "spurious-executable-perm" chmod 644 docs/booth/ProdProgEntwMitOpenSourceSystems2007.odp -if [[ $SOURCE_DATE_EPOCH ]] ; then +if [ -n "$SOURCE_DATE_EPOCH" ] ; then datestr=$(date -u "-d@$SOURCE_DATE_EPOCH" +%Y/%m/%d) sed -i -e 's!{\$I %%date%%}!'"'$datestr'"'!' \ ide/ideinfodlg.pas ide/aboutfrm.pas ide/idefpcinfo.pas @@ -137,7 +137,7 @@ if [[ $SOURCE_DATE_EPOCH ]] ; then fi # fix shebang -for i in $(find . \( -name "*.sh" -o -name "*.pl" \)); do sed -i '1s|#!/usr/bin/env|%{_bindir}/|' ${i}; done +find . \( -name "*.sh" -o -name "*.pl" \) -exec sed -i '1s|#!/usr/bin/env|%{_bindir}/|' {} + %build # Don't use -gs (use explicitly "stabs" debuginfo) for compiling lhelp but -g (use the default debuginfo type "dwarf") as in the rest of package's Makefiles @@ -190,7 +190,7 @@ rm -f %{buildroot}%{_bindir}/lazarus-ide ln -sf ../%{_lib}/%{name}/lazarus %{buildroot}%{_bindir}/lazarus-ide for f in lazres lrstolfm updatepofiles; do ln -sf ../%{_lib}/%{name}/tools/$f %{buildroot}%{_bindir}/$f - cat %{buildroot}%{_libdir}/%{name}/install/man/man1/${f}.1 | gzip > %{buildroot}%{_mandir}/man1/${f}.1.gz + cat %{buildroot}%{_libdir}/%{name}/install/man/man1/${f}.1 | gzip >%{buildroot}%{_mandir}/man1/${f}.1.gz done # collect docs and samples @@ -222,7 +222,7 @@ install -Dpm 0644 %{S:1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml # configs install -dm 0755 %{buildroot}%{_sysconfdir}/%{name} -cat tools/install/linux/environmentoptions.xml | sed -e "s#__LAZARUSDIR__#%{_libdir}/%{name}/#" -e "s#__FPCSRCDIR__#%{_datadir}/fpcsrc/#" > %{buildroot}%{_sysconfdir}/%{name}/environmentoptions.xml +sed %{buildroot}%{_sysconfdir}/%{name}/environmentoptions.xml # fix permissions chmod -x %{buildroot}%{_defaultdocdir}/%{name}/docs/html/build_lcl_chm.sh \