diff --git a/lazarus-2.0.10-2.tar.gz b/lazarus-2.0.10-2.tar.gz new file mode 100644 index 0000000..0b09f94 --- /dev/null +++ b/lazarus-2.0.10-2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64d5626468dd24a3332b205f3abd0a581ab7de1b060a2d57e21864066cfd43b7 +size 69626076 diff --git a/lazarus-2.0.10-fpc304.patch b/lazarus-2.0.10-fpc304.patch deleted file mode 100644 index 4405cf5..0000000 --- a/lazarus-2.0.10-fpc304.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Mattias Gaertner -Date: 2020-07-07 09:25:48 UTC -Subject: fixed compile fpc 3.0.4 -References: r63523 - -chmhelp: fixed compile fpc 3.0.4 - ---- trunk/components/chmhelp/lhelp/chmspecialparser.pas 2020/07/07 03:59:57 63522 -+++ trunk/components/chmhelp/lhelp/chmspecialparser.pas 2020/07/07 09:25:48 63523 -@@ -136,6 +136,7 @@ - // Add new child node - fLastNode := AParentNode; - NewNode := TContentTreeNode(fTreeView.Items.AddChild(AParentNode, txt)); -+ {$IF FPC_FULLVERSION>=30200} - URL:=''; - for x:=0 to AItem.SubItemcount-1 do - begin -@@ -146,6 +147,9 @@ - if URL<>'' then - break; - end; -+ {$ELSE} -+ URL:=AItem.URL; -+ {$ENDIF} - NewNode.Url := FixURL('/'+URL); - NewNode.Data := fChm; - if fTreeView.Images <> nil then diff --git a/lazarus-2.0.10.tar.gz b/lazarus-2.0.10.tar.gz deleted file mode 100644 index 83b2c67..0000000 --- a/lazarus-2.0.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c767cc2836bb28fe3d3b8afb2a2f0ef94ea96c7132154e678dff448eb49fcd3b -size 69625081 diff --git a/lazarus.changes b/lazarus.changes index 7ae08f3..8d32370 100644 --- a/lazarus.changes +++ b/lazarus.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Sep 4 13:20:40 UTC 2020 - Guillaume GARDET + +- Lazarus released a new 2.0.10 tarball (2.0.10-2) which just + includes the lazarus-2.0.10-fpc304.patch patch on top of the + previous one. Use this new tarball and update the Source + URL accordingly +- Drop upstreamed patch: + * lazarus-2.0.10-fpc304.patch +- Run specfile cleaner + ------------------------------------------------------------------- Wed Jul 8 17:15:55 UTC 2020 - Luigi Baldoni diff --git a/lazarus.spec b/lazarus.spec index 51f87fc..a08194a 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -25,7 +25,7 @@ Summary: FreePascal RAD IDE and Component Library License: GPL-2.0-only AND LGPL-2.0-only AND MPL-1.1 Group: Development/Languages/Other URL: http://www.lazarus.freepascal.org/ -Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}-2.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 Source90: %{name}-rpmlintrc @@ -33,17 +33,22 @@ Source90: %{name}-rpmlintrc Patch0: %{name}-Makefile_patch.diff # PATCH-FIX-OPENSUSE lazarus.desktop.patch -- Fix desktop file Patch1: lazarus.desktop.patch -# PATCH-FIX-UPSTREAM lazarus-2.0.10-fpc304.patch -Patch2: lazarus-2.0.10-fpc304.patch +BuildRequires: dos2unix +BuildRequires: fdupes +BuildRequires: fpc >= 3.0.0 +BuildRequires: fpc-src >= 3.0.0 +Requires: fpc +Requires: fpc-src +Requires: gdb +Requires(post): desktop-file-utils +Requires(post): shared-mime-info +Requires(postun): desktop-file-utils +Requires(postun): shared-mime-info %if 0%{?suse_version} > 1210 BuildRequires: desktop-file-utils %else BuildRequires: update-desktop-files %endif -BuildRequires: dos2unix -BuildRequires: fdupes -BuildRequires: fpc >= 3.0.0 -BuildRequires: fpc-src >= 3.0.0 %if 0%{?suse_version} >= 1140 BuildRequires: hicolor-icon-theme %endif @@ -61,9 +66,6 @@ BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) %endif -Requires: fpc -Requires: fpc-src -Requires: gdb %if 0%{?sles_version} == 11 Requires: glib2-devel Requires: gtk2-devel @@ -71,11 +73,6 @@ Requires: gtk2-devel Requires: pkgconfig(glib-2.0) Requires: pkgconfig(gtk+-2.0) %endif -Requires(post): desktop-file-utils -Requires(post): shared-mime-info -Requires(postun): desktop-file-utils -Requires(postun): shared-mime-info -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Lazarus is a Rapid Application Development @@ -103,7 +100,6 @@ Development files for Free Pascal interface to Qt5. %setup -q -n %{name} %patch0 -p1 %patch1 -p1 -%patch2 -p1 # remove unneeded files rm -rf debian @@ -140,7 +136,7 @@ if [ -n "$SOURCE_DATE_EPOCH" ] ; then fi # fix shebang -find . \( -name "*.sh" -o -name "*.pl" \) -exec sed -i '1s|#!/usr/bin/env|%{_bindir}/|' {} + +find . \( -name "*.sh" -o -name "*.pl" \) -exec sed -i '1s|#!%{_bindir}/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 @@ -221,7 +217,7 @@ install -Dpm 0644 install/lazarus.desktop %{buildroot}%{_datadir}/applications/% install -Dpm 0644 install/%{name}-mime.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml # software gallery metadata -install -Dpm 0644 %{S:1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml # configs install -dm 0755 %{buildroot}%{_sysconfdir}/%{name} @@ -240,7 +236,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings %icon_theme_cache_post %desktop_database_post %else -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : %endif %postun @@ -249,7 +245,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings %icon_theme_cache_postun %desktop_database_postun %else -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : %endif %endif @@ -261,7 +257,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings %files %defattr(-,root,root,-) -%doc %{_mandir}/man1/* +%{_mandir}/man1/* %doc %{_defaultdocdir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/environmentoptions.xml @@ -286,12 +282,12 @@ rm -rf %{buildroot}%{_libdir}/%{name}/lcl/interfaces/qt5/cbindings %if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 %files -n libQt5Pas%{sover} %defattr(-,root,root,-) -%doc lcl/interfaces/qt5/cbindings/COPYING.TXT +%license lcl/interfaces/qt5/cbindings/COPYING.TXT %{_libdir}/libQt5Pas.so.%{sover}* %files -n libQt5Pas-devel %defattr(-,root,root,-) -%doc lcl/interfaces/qt5/cbindings/COPYING.TXT +%license lcl/interfaces/qt5/cbindings/COPYING.TXT %dir %{_datadir}/fpcsrc %dir %{_datadir}/fpcsrc/packages %dir %{_datadir}/fpcsrc/packages/qt5