Update to upstream version 1.8.0

7 years ago · 9399a13247
parent bea959b100
commit 9399a13247
4 changed files with 53 additions and 33 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,4 @@ lazarus-0.9.28-src.tar.bz2
 /lazarus-1.6RC1-0.tar.gz
 /lazarus-1.6.2-0.tar.gz
 /lazarus-1.6.4-0.tar.gz
+/lazarus-1.8.0.tar.gz
--- a/disable_pascalscript_powerpc64.diff
+++ b/disable_pascalscript_powerpc64.diff
@ -1,24 +1,8 @@
-Index: lazarus/ide/lazarus.pp
-===================================================================
--- lazarus/ide/lazarus.pp	(revision 54032)
-+++ lazarus/ide/lazarus.pp	(working copy)
-@@ -73,8 +73,11 @@
-     TurboPowerIPro, TurboPowerIProDsgn,
-     jcfidelazarus, chmhelppkg,
-     FPCUnitTestRunner, FPCUnitIDE, ProjTemplates, TAChartLazarusPkg,
-    TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz, pascalscript, EditorMacroScript,
-+    TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz, 
-+  {$IFNDEF CPUPOWERPC64}
-+    pascalscript, EditorMacroScript,
-   {$ENDIF}
-+  {$ENDIF}
-   MainBase;
- 
- {$I revision.inc}
-===================================================================
--- lazarus/components/Makefile.fpc	(revision 54032)
-+++ lazarus/components/Makefile.fpc	(working copy)
-@@ -56,8 +56,10 @@
+diff --git lazarus/components/Makefile.fpc lazarus/components/Makefile.fpc
+index f7578d9..e88fda9 100644
+--- lazarus/components/Makefile.fpc
+++ lazarus/components/Makefile.fpc
+@@ -70,8 +70,10 @@ bigide:
 	$(MAKE) -C externhelp
 	$(MAKE) -C tdbf
 	$(MAKE) -C sqldb
@ -27,5 +11,41 @@ Index: lazarus/ide/lazarus.pp
 	$(MAKE) -C macroscript
 +endif
 
- all: bigide
+ all: base bigide
+ 
+@@ -108,8 +110,10 @@ clean:
+ 	$(MAKE) -C externhelp clean
+ 	$(MAKE) -C tdbf clean
+ 	$(MAKE) -C sqldb clean
+ifneq ($(CPU_TARGET),powerpc64)
+ 	$(MAKE) -C PascalScript/Source clean
+ 	$(MAKE) -C macroscript clean
+endif
+ 
+ cleanall: clean
+ 
+@@ -146,6 +150,8 @@ distclean:
+ 	$(MAKE) -C externhelp distclean
+ 	$(MAKE) -C tdbf distclean
+ 	$(MAKE) -C sqldb distclean
+ifneq ($(CPU_TARGET),powerpc64)
+ 	$(MAKE) -C PascalScript/Source distclean
+ 	$(MAKE) -C macroscript distclean
+endif
+ 
+diff --git lazarus/ide/lazarus.pp lazarus/ide/lazarus.pp
+index b6ea8c7..54ddb1a 100644
+--- lazarus/ide/lazarus.pp
+++ lazarus/ide/lazarus.pp
+@@ -73,7 +73,10 @@ uses
+     TurboPowerIPro, TurboPowerIProDsgn,
+     jcfidelazarus, chmhelppkg,
+     FPCUnitTestRunner, FPCUnitIDE, ProjTemplates, TAChartLazarusPkg,
+-    TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz, pascalscript, EditorMacroScript,
+    TodoListLaz, DateTimeCtrls, SQLDBLaz, DBFLaz,
+    {$IFNDEF CPUPOWERPC64}
+      pascalscript, EditorMacroScript,
+    {$ENDIF}
+   {$ENDIF}
+   MainBase;
 
--- a/lazarus.spec
+++ b/lazarus.spec
@ -1,13 +1,13 @@
 Name:           lazarus
-Version:        1.6.4
-Release:        4%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Lazarus Component Library and IDE for Freepascal

 Group:          Development/Languages
 # GNU Classpath style exception, see COPYING.modifiedLGPL
 License:        GPLv2+ and MPLv1.1 and LGPLv2+ with exceptions
 URL:            http://www.lazarus-ide.org/
-Source0:        http://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}-0.tar.gz
+Source0:        http://downloads.sourceforge.net/project/%{name}/Lazarus%20Zip%20_%20GZip/Lazarus%20%{version}/%{name}-%{version}.tar.gz
 patch0:         Makefile_patch.diff
 patch1:         Desktop_patch.diff
 patch2:         disable_pascalscript_powerpc64.diff
@ -63,21 +63,15 @@ chmod 755 %{buildroot}%{_libdir}/%{name}/components/lazreport/tools/localize.sh
 %post
 /usr/bin/update-desktop-database -q &> /dev/null || :
 /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :

 %postun
 /usr/bin/update-desktop-database -q &> /dev/null ||:
 if [ $1 -eq 0 ] ; then
  /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi

 %posttrans
 /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

 %files
 %defattr(-,root,root,-)
@ -92,13 +86,18 @@ fi
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/mime/packages/lazarus.xml
 %{_datadir}/icons/hicolor/48x48/mimetypes/*
-%doc lazarus/COPYING*
+%license lazarus/COPYING*
 %doc lazarus/README.txt
 %dir %{_sysconfdir}/lazarus
 %config(noreplace) %{_sysconfdir}/lazarus/environmentoptions.xml
 %{_mandir}/*/*

 %changelog
+* Sat Feb 24 2018 Artur Iwicki <fedora@svgames.pl> - 1.8.0-1
+- Update to upstream version 1.8.0
+- Remove obsolete scriplets (icon cache update)
+- Use the %license tag instead of %doc for licence files
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (lazarus-1.6.4-0.tar.gz) = d7d498483ef9e1eebd0d8ca2325d1984cb1297837ebe2f9547e67f26fc049c2168e2feeac739b8403c08a8251040e9161c962d25951545384ffbdbb076fda2aa
+SHA512 (lazarus-1.8.0.tar.gz) = dd5e02e9c0a057cf9a6b2c15605969cf4cb743aa78fc81bfdc7c566434127893cf32bab5bd1729f79b51c611bf9ae015bea8d774e0544ead42a064f1224ffd7b