From 26f27f4c5d371ace953c106f35e9bee2e7c8f0af7ab70ecd39f43f1f873a5d7c Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Thu, 10 Jul 2014 17:02:10 +0000
Subject: [PATCH] Accepting request 240229 from home:ecsos

update to 1.2.4

OBS-URL: https://build.opensuse.org/request/show/240229
OBS-URL: https://build.opensuse.org/package/show/devel:languages:pascal/lazarus?expand=0&rev=28
---
 lazarus-1.0.10-0.tar.gz |  3 ---
 lazarus-1.2.4-0.tar.gz  |  3 +++
 lazarus-rpmlintrc       |  1 +
 lazarus.changes         | 21 +++++++++++++++++++++
 lazarus.desktop.patch   |  8 ++++----
 lazarus.spec            |  7 ++++---
 6 files changed, 33 insertions(+), 10 deletions(-)
 delete mode 100644 lazarus-1.0.10-0.tar.gz
 create mode 100644 lazarus-1.2.4-0.tar.gz

diff --git a/lazarus-1.0.10-0.tar.gz b/lazarus-1.0.10-0.tar.gz
deleted file mode 100644
index 762f77c..0000000
--- a/lazarus-1.0.10-0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61fd508c832a9c6a27e624be42257493999fe7a3b2f2ab30b9eccd4a2b4d3758
-size 47688266
diff --git a/lazarus-1.2.4-0.tar.gz b/lazarus-1.2.4-0.tar.gz
new file mode 100644
index 0000000..6cea69f
--- /dev/null
+++ b/lazarus-1.2.4-0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e8622f2b29988514c9b7b7ff6cf2058a8b73e9ef0fd7998c82e1e958d2347d28
+size 51606253
diff --git a/lazarus-rpmlintrc b/lazarus-rpmlintrc
index 08aee78..e3d4f88 100644
--- a/lazarus-rpmlintrc
+++ b/lazarus-rpmlintrc
@@ -1,2 +1,3 @@
 addFilter("devel-file-in-non-devel-package .*/lazarus/components/codetools/examples/scanexamples/test.h")
 addFilter("devel-file-in-non-devel-package .*/lazarus/components/compilers/c/examples/test.c")
+addFilter("incorrect-fsf-address")
diff --git a/lazarus.changes b/lazarus.changes
index 85b7b48..317e4cf 100644
--- a/lazarus.changes
+++ b/lazarus.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Jul  9 22:28:59 UTC 2014 - ecsos@schirra.net
+
+- update to 1.2.4
+  This is a bug fix release. For complete list of changes see
+  http://wiki.lazarus.freepascal.org/Lazarus_1.2_fixes_branch#Fixes_for_1.2.4_.28Merged.29
+
+-------------------------------------------------------------------
+Thu Jan  9 13:56:05 UTC 2014 - ecsos@schirra.net
+
+- update to 1.0.14
+  This is a bug fix release. For complete list of changes see
+  http://wiki.lazarus.freepascal.org/Lazarus_1.0_fixes_branch#Fixes_for_1.0.14_.28Merged.29
+
+-------------------------------------------------------------------
+Wed Oct 16 19:50:56 UTC 2013 - ecsos@schirra.net
+
+- Update to 1.0.12 
+  This is a bug fix release. For complete list of changes see
+  http://wiki.lazarus.freepascal.org/Lazarus_1.0_fixes_branch#Fixes_for_1.0.12_.28Merged.29
+  
 -------------------------------------------------------------------
 Wed Aug  7 20:16:43 UTC 2013 - asterios.dramis@gmail.com
 
diff --git a/lazarus.desktop.patch b/lazarus.desktop.patch
index 66f31a2..fee0d01 100644
--- a/lazarus.desktop.patch
+++ b/lazarus.desktop.patch
@@ -1,8 +1,8 @@
---- lazarus/install/lazarus.desktop.orig	2012-06-24 22:29:27.000000000 +0300
-+++ lazarus/install/lazarus.desktop	2013-08-07 20:13:34.918924400 +0300
-@@ -1,16 +1,11 @@
+diff -Pdpru lazarus.orig/install/lazarus.desktop lazarus/install/lazarus.desktop
+--- lazarus.orig/install/lazarus.desktop	2014-02-04 19:40:31.000000000 +0100
++++ lazarus/install/lazarus.desktop	2014-07-09 19:59:49.959500048 +0200
+@@ -1,15 +1,11 @@
  [Desktop Entry]
--Encoding=UTF-8
  Name=Lazarus
 +GenericName=Integrated Development Environment
  Comment=Lazarus IDE
diff --git a/lazarus.spec b/lazarus.spec
index 763e3ba..95ca4c3 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -18,7 +18,7 @@
 
 
 Name:           lazarus
-Version:        1.0.10
+Version:        1.2.4
 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
@@ -38,8 +38,8 @@ BuildRequires:  update-desktop-files
 %endif
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
-BuildRequires:  fpc >= 2.6.0
-BuildRequires:  fpc-src >= 2.6.0
+BuildRequires:  fpc >= 2.6.4
+BuildRequires:  fpc-src >= 2.6.4
 %if 0%{?suse_version} >= 1140
 BuildRequires:  hicolor-icon-theme
 %endif
@@ -171,6 +171,7 @@ cat tools/install/linux/environmentoptions.xml | sed -e "s#__LAZARUSDIR__#%{_lib
 
 # cleanup
 rm -rf %{buildroot}%{_libdir}/%{name}/install/man
+rm -f %{buildroot}%{_libdir}/%{name}/Makefile.fpc.orig
 %if 0%{?suse_version}
 %fdupes -s %{buildroot}
 %endif