diff --git a/.gitignore b/.gitignore index 501d28b..cf99f05 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ lazarus-0.9.28-src.tar.bz2 /lazarus-1.0.4-1.tar.gz /lazarus-1.0.8-0.tar.gz /lazarus-1.0.14-0.tar.gz +/lazarus-1.4RC2-0.tar.gz diff --git a/Desktop_patch.diff b/Desktop_patch.diff index ebf041e..b44f4b4 100644 --- a/Desktop_patch.diff +++ b/Desktop_patch.diff @@ -1,6 +1,6 @@ --- 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 @@ +@@ -4,13 +4,9 @@ Exec=startlazarus %f Terminal=false Type=Application @@ -10,8 +10,8 @@ +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 -X-Ubuntu-Gettext-Domain=desktop_kdelibs -- diff --git a/Makefile_patch.diff b/Makefile_patch.diff index e6f39fe..973b825 100644 --- a/Makefile_patch.diff +++ b/Makefile_patch.diff @@ -2,16 +2,16 @@ Index: lazarus/Makefile.fpc =================================================================== --- lazarus/Makefile.fpc (version 0.9.26) +++ lazarus/Makefile.fpc (working copy) -@@ -21,7 +21,7 @@ +@@ -20,7 +20,7 @@ [install] fpcpackage=n -basedir=share/lazarus -+basedir=lib/lazarus ++basedir=$(_LIB)/lazarus [dist] destdir=$(BASEDIR)/dist -@@ -29,7 +29,7 @@ +@@ -28,7 +28,7 @@ [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 @@ 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 diff --git a/lazarus.spec b/lazarus.spec index ea4f7d1..fa90a0c 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -1,13 +1,13 @@ Name: lazarus -Version: 1.2 -Release: 4%{?dist} +Version: 1.4 +Release: 0.1.RC2%{?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.freepascal.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}RC2/%{name}-%{version}RC2-0.tar.gz patch0: Makefile_patch.diff patch1: Desktop_patch.diff @@ -32,31 +32,21 @@ rm -rf debian cd tools find install -depth -type d ! \( -path "install/linux/*" -o -path "install/linux" -o -path "install" \) -exec rm -rf '{}' \; cd .. -# Remove patch-backup files -rm Makefile.fpc.orig -rm install/lazarus.desktop.orig export FPCDIR=%{_datadir}/fpcsrc/ fpcmake -Tall make bigide OPT='-gl -gw' make tools OPT='-gl -gw' -# make lazbuilder OPT='-gl -gw' %install rm -rf %{buildroot} make -C lazarus install INSTALL_PREFIX=%{buildroot}%{_prefix} _LIB=%{_lib} -install -D -p -m 0644 lazarus/install/lazarus-mime.xml $LazBuildDir%{buildroot}%{_datadir}/mime/packages/lazarus.xml -install -D -p -m 0644 lazarus/images/ide_icon48x48.png %{buildroot}%{_datadir}/pixmaps/lazarus.png desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ lazarus/install/%{name}.desktop -ln -sf ../%{_lib}/%{name}/lazarus %{buildroot}%{_bindir}/lazarus-ide -ln -sf ../%{_lib}/%{name}/startlazarus %{buildroot}%{_bindir}/startlazarus -ln -sf ../%{_lib}/%{name}/lazbuild %{buildroot}%{_bindir}/lazbuild - install -d %{buildroot}%{_sysconfdir}/lazarus sed 's#__LAZARUSDIR__#%{_libdir}/%{name}#;s#__FPCSRCDIR__#%{_datadir}/fpcsrc#' \ lazarus/tools/install/linux/environmentoptions.xml \ @@ -68,18 +58,23 @@ chmod 755 %{buildroot}%{_libdir}/%{name}/components/lazreport/tools/localize.sh rm -rf %{buildroot} %post -update-desktop-database -q &> /dev/null ||: -touch --no-create %{_datadir}/mime/packages &> /dev/null || : +/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 -update-desktop-database -q &> /dev/null ||: -if [ $1 -eq 0 ]; then -touch --no-create %{_datadir}/mime/packages &> /dev/null || : -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +/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 -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +/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,-) @@ -87,9 +82,13 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_bindir}/%{name}-ide %{_bindir}/startlazarus %{_bindir}/lazbuild +%{_bindir}/lazres +%{_bindir}/lrstolfm +%{_bindir}/updatepofiles %{_datadir}/pixmaps/lazarus.png %{_datadir}/applications/*%{name}.desktop %{_datadir}/mime/packages/lazarus.xml +%{_datadir}/icons/hicolor/48x48/mimetypes/* %doc lazarus/COPYING* %doc lazarus/README.txt %dir %{_sysconfdir}/lazarus @@ -97,6 +96,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_mandir}/*/* %changelog +* Mon Mar 9 2015 Joost van der Sluis - 1.4-0.1.RC2 +- Updated to version 1.4RC2 +- Fixed invalid dates in changelog + * Mon Aug 18 2014 Rex Dieter 1.2-4 - update scriptlets @@ -133,7 +136,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : * Thu Jul 19 2012 Fedora Release Engineering - 0.9.30.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Tue Apr 18 2012 Joost van der Sluis - 0.9.30.4-1 +* Wed Apr 18 2012 Joost van der Sluis - 0.9.30.4-1 - Updated to version 0.9.30.4 - Use default fonts, editoroptions.xml file removed @@ -191,7 +194,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : * Wed Jun 18 2008 Joost van der Sluis 0.9.24-4 - removed the trailing slash from the FPCDIR export in the build section -* Tue Apr 24 2008 Joost van der Sluis 0.9.24-3 +* Thu Apr 24 2008 Joost van der Sluis 0.9.24-3 - Remove executable-bit in install-section, instead of the files section - Enabled debug-package on x86_64 @@ -239,15 +242,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : * Tue May 23 2006 Joost van der Sluis 0.9.14-4 - Only build the basic IDE, to remove dependencies on things which are buggy in fpc 2.0.2 -* Tue May 4 2006 Joost van der Sluis 0.9.14-3 +* Thu May 4 2006 Joost van der Sluis 0.9.14-3 - Added the ability to create gtk2-applications -* Tue May 4 2006 Joost van der Sluis 0.9.14-2 +* Thu May 4 2006 Joost van der Sluis 0.9.14-2 - Updated to version 0.9.14-1. - Changed the Source0 download url from prdownloads to downloads.sourceforge.net -* Tue Apr 10 2006 Joost van der Sluis 0.9.14-1 +* Mon Apr 10 2006 Joost van der Sluis 0.9.14-1 - Updated to version 0.9.14. * Tue Mar 28 2006 Joost van der Sluis 0.9.12-1 diff --git a/sources b/sources index 39479a6..615162c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f36e7182cf5a5d75a7157104d1370e0b lazarus-1.2-0.tar.gz +fc028c1dc7f948c73f0531655f302a70 lazarus-1.4RC2-0.tar.gz