mirror of
https://abf.rosa.ru/djam/lazarus.git
synced 2025-02-23 15:12:46 +00:00
New version 1.4.4
This commit is contained in:
parent
a6c599197d
commit
39162fbc91
4 changed files with 25 additions and 23 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
lazarus-1.2.4-0.tar.gz: 3288055d9f4258126a0ab7827cc203fc13acc99d
|
||||
lazarus-1.4.4-0.tar.gz: 3027d30ecda3c421434cd12ce0bd17afaa36e4aa
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
--- lazarus/install/lazarus.desktop 2007-11-26 15:34:42.000000000 +0100
|
||||
+++ lazarus/install/lazarus.desktop.n 2008-10-18 11:52:33.000000000 +0200
|
||||
@@ -5,12 +5,7 @@
|
||||
diff -urN lazarus/install/lazarus.desktop lazarus-patched/install/lazarus.desktop
|
||||
--- a/lazarus/install/lazarus.desktop 2014-06-15 19:57:06.000000000 +1100
|
||||
+++ b/lazarus-patched/install/lazarus.desktop 2015-11-24 01:10:39.170139344 +1000
|
||||
@@ -4,13 +4,8 @@
|
||||
Exec=startlazarus %f
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
@ -10,6 +11,7 @@
|
|||
+Categories=IDE;Development;GTK;GUIDesigner;
|
||||
StartupWMClass=Lazarus
|
||||
MimeType=text/x-pascal;text/lazarus-project-source;text/lazarus-project-information;text/lazarus-form;text/lazarus-resource;text/lazarus-package;text/lazarus-package-link;text/lazarus-code-inlay;
|
||||
Keywords=editor;Pascal;IDE;FreePascal;fpc;Design;Designer;
|
||||
-[Property::X-KDE-NativeExtension]
|
||||
-Type=QString
|
||||
-Value=.pas
|
|
@ -1,8 +1,8 @@
|
|||
Index: lazarus/Makefile.fpc
|
||||
===================================================================
|
||||
--- lazarus/Makefile.fpc (version 0.9.26)
|
||||
+++ lazarus/Makefile.fpc (working copy)
|
||||
@@ -21,7 +21,7 @@
|
||||
diff --git a/lazarus/Makefile.fpc b/lazarus/Makefile.fpc
|
||||
index a190b53..ef95ca9 100644
|
||||
--- a/lazarus/Makefile.fpc
|
||||
+++ b/lazarus/Makefile.fpc
|
||||
@@ -20,7 +20,7 @@ files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildc
|
||||
|
||||
[install]
|
||||
fpcpackage=n
|
||||
|
@ -11,7 +11,7 @@ Index: lazarus/Makefile.fpc
|
|||
|
||||
[dist]
|
||||
destdir=$(BASEDIR)/dist
|
||||
@@ -29,7 +29,7 @@
|
||||
@@ -28,7 +28,7 @@ destdir=$(BASEDIR)/dist
|
||||
[prerules]
|
||||
RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
|
||||
#
|
||||
|
@ -20,14 +20,14 @@ Index: lazarus/Makefile.fpc
|
|||
INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
|
||||
ifneq ($(findstring $(OS_TARGET),win32 win64),)
|
||||
LAZARUS_INSTALL_DIR=C:\lazarus
|
||||
@@ -115,8 +115,8 @@
|
||||
@@ -256,8 +256,9 @@ installbase:
|
||||
ifneq ($(findstring $(OS_TARGET),win32 win64),)
|
||||
|
||||
else
|
||||
- $(MKDIR) $(INSTALL_PREFIX)/share
|
||||
- $(MKDIR) $(INSTALL_PREFIX)/share/lazarus
|
||||
+ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)
|
||||
+ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)/lazarus
|
||||
$(MKDIR) $(INSTALL_BINDIR)
|
||||
$(MKDIR) $(INSTALL_MAN_DIR)
|
||||
$(MKDIR) $(INSTALL_MAN_DIR)/man1
|
||||
$(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
|
14
lazarus.spec
14
lazarus.spec
|
@ -1,7 +1,7 @@
|
|||
Summary: Lazarus Component Library and IDE for Freepascal
|
||||
Name: lazarus
|
||||
Version: 1.2.4
|
||||
Release: 2
|
||||
Version: 1.4.4
|
||||
Release: 1
|
||||
# GNU Classpath style exception, see COPYING.modifiedLGPL
|
||||
License: GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
|
||||
Group: Development/Pascal
|
||||
|
@ -9,8 +9,8 @@ Url: http://www.lazarus.freepascal.org/
|
|||
Source0: http://sourceforge.net/projects/%{name}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}-0.tar.gz
|
||||
Source1: lazarus-miscellaneousoptions
|
||||
Source10: lazarus.rpmlintrc
|
||||
Patch0: Makefile_patch.diff
|
||||
Patch1: Desktop_patch.diff
|
||||
Patch0: lazarus-1.4.4-makefile.patch
|
||||
Patch1: lazarus-1.4.4-desktop.patch
|
||||
Patch3: add_gdb_settings.patch
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: fpc >= 2.6.0
|
||||
|
@ -56,9 +56,9 @@ fi
|
|||
#----------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -c
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%setup -qc
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch3 -p0
|
||||
|
||||
%build
|
||||
|
|
Loading…
Add table
Reference in a new issue