From 0a5134bf1a7d735c3ae6571f77322c78b9880340 Mon Sep 17 00:00:00 2001
From: Artur Frenszek-Iwicki <fedora@svgames.pl>
Date: Fri, 30 Apr 2021 17:35:00 +0200
Subject: [PATCH] Update to 2.0.12

---
 .gitignore          |  1 +
 Makefile_patch.diff | 15 ++++++++++-----
 lazarus.spec        | 16 +++++++++++-----
 sources             |  2 +-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27ee784..67887c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ lazarus-0.9.28-src.tar.bz2
 /lazarus-2.0.6.tar.gz
 /lazarus-2.0.8.tar.gz
 /lazarus-2.0.10-2.tar.gz
+/lazarus-2.0.12.tar.gz
diff --git a/Makefile_patch.diff b/Makefile_patch.diff
index 39b1f7e..17fe416 100644
--- a/Makefile_patch.diff
+++ b/Makefile_patch.diff
@@ -1,6 +1,7 @@
---- lazarus/Makefile.fpc	2017-10-18 09:51:34.000000000 +0200
-+++ lazarus/Makefile.fpc.patched	2019-02-08 19:55:55.499867322 +0100
-@@ -20,7 +20,7 @@
+--- lazarus-2.0.12--orig/lazarus/Makefile.fpc	2020-07-24 18:14:39.000000000 +0200
++++ lazarus-2.0.12--patched/lazarus/Makefile.fpc	2021-04-30 16:51:44.926870797 +0200
+@@ -19,18 +19,18 @@
+ files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
  
  [install]
  fpcpackage=n
@@ -9,16 +10,19 @@
  
  [dist]
  destdir=$(BASEDIR)/dist
-@@ -28,7 +28,7 @@
+ 
  [prerules]
  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
-@@ -263,8 +263,9 @@
+ endif
+@@ -270,10 +270,11 @@
+ installbase:
  ifneq ($(findstring $(OS_TARGET),win32 win64),)
  
  else
@@ -29,3 +33,4 @@
  	$(MKDIR) $(INSTALL_PREFIX)/share/applications
  	$(MKDIR) $(INSTALL_PREFIX)/share/pixmaps
  	$(MKDIR) $(INSTALL_PREFIX)/share/mime/packages
+ 	$(MKDIR) $(INSTALL_PREFIX)/share/icons/hicolor/48x48/mimetypes
diff --git a/lazarus.spec b/lazarus.spec
index 4465843..cb9843f 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -1,17 +1,19 @@
 Name:           lazarus
 Summary:        Lazarus Component Library and IDE for Freepascal
 
-Version:        2.0.10
-Release:        7%{?dist}
+Version:        2.0.12
+
+%global baserelease 1
+Release:        %{baserelease}%{?dist}
 
 # The qt5pas version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro
 %global qt5pas_version 2.6
-%global qt5pas_release %(relstr="%{version}.%{release}"; relstr=(${relstr//./ }); ((relno=${relstr[0]}*1000000 + ${relstr[1]}*10000 + ${relstr[2]}*100 + ${relstr[3]})); echo "${relno}%{?dist}";)
+%global qt5pas_release %(relstr="%{version}.%{baserelease}"; relstr=(${relstr//./ }); ((relno=${relstr[0]}*1000000 + ${relstr[1]}*10000 + ${relstr[2]}*100 + ${relstr[3]})); echo "${relno}%{?dist}";)
 
 # GNU Classpath style exception, see COPYING.modifiedLGPL
 License:        GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
 URL:            http://www.lazarus-ide.org/
-Source0:        https://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}-2.tar.gz
+Source0:        https://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}.tar.gz
 
 Source100:      lazarus.appdata.xml
 
@@ -70,7 +72,7 @@ developing applications that use qt5pas.
 
 %prep
 %setup -c -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 
 
@@ -163,6 +165,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 
 
 %changelog
+* Fri Apr 30 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 2.0.12-1
+- Update to 2.0.12
+- Use baserelease macro to fix the rpmdev-bumspec issues
+
 * Fri Feb 05 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 2.0.10-7
 - Fix FailsToInstall due to .1 added to qt5pas release number
 
diff --git a/sources b/sources
index 01c8841..53279b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lazarus-2.0.10-2.tar.gz) = a1dcac94646f75c9ab674b6f2db83d75bad76c81dcae10fe25b2901380a606765b34f2d43496939e27fdd092d30629c3116ea660b13b4a741ffdf37ff7752eae
+SHA512 (lazarus-2.0.12.tar.gz) = dfd22b2b96fca9d0f672f03b9120c4294a7e640737a09b26c274d304025c61566a8504a5484638c108e42a322b21992229451d95e38d7e491a1c2f07a663483e