backports 2.2.0

This commit is contained in:
Sergey Zhemoitel 2022-01-09 18:25:44 +03:00
parent 47e19ef7d3
commit ed731482b4
4 changed files with 39 additions and 9 deletions

View file

@ -1,2 +1,2 @@
sources:
lazarus-2.0.10-2.tar.gz: aca8588bf4717a9193efa5ce19dcf2e833a12b97
lazarus-2.2.0-0.tar.gz: 70ad33e99a2252e69ad7644839cd306aef8cb5b9

View file

@ -0,0 +1,32 @@
diff -ruN a/lazarus/Makefile.fpc b/lazarus/Makefile.fpc
--- a/lazarus/Makefile.fpc 2022-01-02 13:01:23.000000000 +0300
+++ b/lazarus/Makefile.fpc 2022-01-09 12:59:19.416777742 +0300
@@ -20,7 +20,7 @@
[install]
fpcpackage=n
-basedir=share/lazarus
+basedir=lib/lazarus
[dist]
destdir=$(BASEDIR)/dist
@@ -29,7 +29,7 @@
RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
#
ifndef LAZARUS_INSTALL_DIR
-LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/share/lazarus
+LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/$(_LIB)/lazarus
INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
ifneq ($(findstring $(OS_TARGET),win32 win64),)
LAZARUS_INSTALL_DIR=C:\lazarus
@@ -287,8 +287,9 @@
ifneq ($(findstring $(OS_TARGET),win32 win64),)
else
+ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)
+ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)/lazarus
$(MKDIR) $(INSTALL_PREFIX)/share
- $(MKDIR) $(INSTALL_PREFIX)/share/lazarus
$(MKDIR) $(INSTALL_PREFIX)/share/applications
$(MKDIR) $(INSTALL_PREFIX)/share/pixmaps
$(MKDIR) $(INSTALL_PREFIX)/share/mime/packages

View file

@ -1,5 +1,4 @@
# We really don't need to strip some stuff
addFilter("E: unstripped-binary-or-object")
# Keep examples
addFilter("W: devel-file-in-non-devel-package")

View file

@ -1,16 +1,15 @@
Summary: Lazarus Component Library and IDE for Freepascal
Name: lazarus
Version: 2.0.10
Version: 2.2.0
Release: 1
# GNU Classpath style exception, see COPYING.modifiedLGPL
License: GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
Group: Development/Pascal
Url: http://www.lazarus-ide.org/
Source0: https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}-2.tar.gz
Source0: https://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%202.2.0/%{name}-%{version}-0.tar.gz
Source1: lazarus-miscellaneousoptions
Source10: lazarus.rpmlintrc
Patch0: lazarus-1.4.4-makefile.patch
Patch1: add_gdb_settings.patch
Patch0: lazarus-2.2.0-makefile.patch
BuildRequires: desktop-file-utils
BuildRequires: fpc >= 3.2.0
BuildRequires: fpc-src >= 3.2.0
@ -26,13 +25,15 @@ Requires: pkgconfig(gdk-pixbuf-2.0)
Requires: pkgconfig(glib-2.0)
Requires: pkgconfig(gtk+-2.0)
Requires: glibc-devel
# Free Pascal Compiler (fpc) not builded on arm
ExcludeArch: %{armx}
%description
Lazarus is a free and opensource RAD tool for freepascal using the lazarus
component library - LCL, which is also included in this package.
%files
%doc lazarus/COPYING* lazarus/README.txt
%doc lazarus/COPYING* lazarus/README.md
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/environmentoptions.xml
%{_bindir}/%{name}-ide
@ -56,8 +57,6 @@ fi
%prep
%setup -qc
%patch0 -p1
%patch1 -p0
%build
cd lazarus