diff --git a/lazarus-0.9.24-0.tar.gz b/lazarus-0.9.24-0.tar.gz deleted file mode 100644 index 77fa905..0000000 --- a/lazarus-0.9.24-0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4720c8d633c8e3d18750452278d135450c7c942ff591c10cd7d9afc6bc0f724e -size 11037130 diff --git a/lazarus-0.9.28.2-src.tar.bz2 b/lazarus-0.9.28.2-src.tar.bz2 deleted file mode 100644 index db7901c..0000000 --- a/lazarus-0.9.28.2-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5711372c6724d19624be6cb8f6c397d789f3ac6fd7f70f825817ee47bd0e4dfd -size 12933724 diff --git a/lazarus-0.9.30-src.tar.bz2 b/lazarus-0.9.30-src.tar.bz2 new file mode 100644 index 0000000..1f9b78f --- /dev/null +++ b/lazarus-0.9.30-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee8ba358e996a6f436f70d15e64976789c2b8f28b2e2dbf1b737de593b4d23e3 +size 17926864 diff --git a/lazarus-Makefile_patch.diff b/lazarus-Makefile_patch.diff index 4194e51..35a380b 100644 --- a/lazarus-Makefile_patch.diff +++ b/lazarus-Makefile_patch.diff @@ -1,7 +1,5 @@ -Index: lazarus/Makefile.fpc -=================================================================== ---- lazarus/Makefile.fpc (version 0.9.26) -+++ lazarus/Makefile.fpc (working copy) +--- lazarus/Makefile.fpc (version 0.9.30) ++++ lazarus/Makefile.fpc 2011-04-01 17:56:24.000000000 -0400 @@ -21,7 +21,7 @@ [install] @@ -20,8 +18,8 @@ Index: lazarus/Makefile.fpc INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man ifneq ($(findstring $(OS_TARGET),win32 win64),) LAZARUS_INSTALL_DIR=C:\lazarus -@@ -110,8 +110,8 @@ - ifeq ($(OS_TARGET),win32) +@@ -115,8 +115,8 @@ + ifneq ($(findstring $(OS_TARGET),win32 win64),) else - $(MKDIR) $(INSTALL_PREFIX)/share diff --git a/lazarus.changes b/lazarus.changes new file mode 100644 index 0000000..d8642c7 --- /dev/null +++ b/lazarus.changes @@ -0,0 +1,57 @@ +------------------------------------------------------------------- +Fri Apr 1 22:54:14 UTC 2011 - termim@gmail.com + +- Update to 0.9.30 + +------------------------------------------------------------------- +Tue Nov 03 2009 Toni Graffy - 0.9.28.2-1.pm.1 + +- fixed configfile environmentoptions.xml + +------------------------------------------------------------------- +Sun Nov 01 2009 Toni Graffy - 0.9.28.2-0.pm.1 + +- update to 0.9.28.2 +- This release fixes compiling a test application without saving (missing + project1.lrs). The Lazarus directory is now set correctly by the deb package. + Some other small fixes are also included. + +------------------------------------------------------------------- +Tue Oct 27 2009 Toni Graffy - 0.9.28-0.pm.1 + +- update to 0.9.28 +- In this major release, the IDE has many source editor improvements like display + of "double width" fonts (such as Eastern, Japanese, Chinese, and Arabic), better + code folding, highlighting, syncro editing, and persistent blocks. The debugger + has assembler windows, easier exception handling, and breakpoint properties. The + LCL now uses GTK2 as the default widgetset on Linux and BSD and includes the + TMonitor class for multi-monitor support. Refactoring of LCL reduced the minimum + size of executables by about 15%. The support of TFrame support has improved, so + you can visually nest designers in the IDE. + +------------------------------------------------------------------- +Mon May 04 2009 Toni Graffy - 0.9.26.2-0.pm.3 + +- rebuild against fpc-2.2.4 + +------------------------------------------------------------------- +Mon Mar 23 2009 Toni Graffy - 0.9.26.2-0.pm.2 + +- update to 0.9.26.2 (release-tarball) + +------------------------------------------------------------------- +Sat Feb 28 2009 Toni Graffy - 0.9.26.2-0.pm.1 + +- update to 0.9.26.2 + svn co https://lazarus.svn.sourceforge.net/svnroot/lazarus/tags/lazarus_0_9_26_2 lazarus + +------------------------------------------------------------------- +Sat Nov 01 2008 Toni Graffy - 0.9.26-0.pm.2 + +- rebuild against fpc-2.2.2-0.pm.2 + +------------------------------------------------------------------- +Thu Oct 30 2008 Toni Graffy - 0.9.26-0.pm.1 + +- initial build for packman (fpc-2.2.2 is working with this version) +- based on fedora spec-file from Lubomir Rintel diff --git a/lazarus.spec b/lazarus.spec index 07f3cf8..7060d78 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -1,14 +1,16 @@ +# +# spec file for package lazarus +# # Copyright (c) 2008-2009 oc2pus # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments to toni@links2linux.de # norootforbuild Name: lazarus -Version: 0.9.28.2 -Release: 1.pm.1 +Version: 0.9.30 +Release: 0 Summary: Lazarus Component Library and IDE Group: Development/Languages/Other License: GPL and modified LGPL @@ -18,31 +20,39 @@ Url: http://www.lazarus.freepascal.org/ # svn co https://lazarus.svn.sourceforge.net/svnroot/lazarus/tags/lazarus_0_9_26_2 lazarus #Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 # release build: -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 +#Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 +Source0: %{name}-%{version}-src.tar.bz2 Source1: %{name}.desktop Source90: %{name}-rpmlintrc Patch: %{name}-Makefile_patch.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: shared-mime-info + +BuildRequires: ImageMagick BuildRequires: dos2unix -BuildRequires: fdupes BuildRequires: fpc >= 2.2.4 BuildRequires: fpc-src >= 2.2.4 -BuildRequires: gdk-pixbuf-devel +BuildRequires: gtk2 +BuildRequires: gtk2-devel +%if 0%{?suse_version} +PreReq: shared-mime-info +BuildRequires: fdupes BuildRequires: glib2-devel -BuildRequires: gtk2-devel gtk2 -BuildRequires: gtk-devel BuildRequires: update-desktop-files -Requires: fpc >= 2.2.4 -Requires: fpc-src >= 2.2.4 -Requires: gdb -Requires: gdk-pixbuf-devel -Requires: glib2-devel -Requires: gtk2-devel - %if %suse_version >= 1120 BuildRequires: libdb-4_5-devel %endif +Requires: glib2-devel +Requires: gtk2-devel +%endif +Requires: gdb +Requires: fpc + +%if 0%{?fedora_version} +Requires: fpc-src +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils +%endif %description Lazarus is a free and open source Rapid Application Development @@ -54,7 +64,6 @@ library - LCL. The LCL is included in this package. %prep %setup -q -n %{name} %patch -p1 -%__rm Makefile.fpc.orig # remove the files for building debian-repositories %__rm -rf debian @@ -62,8 +71,10 @@ library - LCL. The LCL is included in this package. %__rm tools/install/cross_unix/create_linux_cross_win32_deb.sh %__rm tools/install/cross_unix/HowToCreate_fpc_crosswin32_deb.txt +# remove the files for installing on macosx +%__rm -rf tools/install/macosx/ + # remove scripts vulnerable to symlink-attacks (bug 460642) -%__rm tools/convert_po_file_to_utf-8.sh %__rm tools/install/build_fpc_snaphot_rpm.sh %__rm tools/install/check_fpc_dependencies.sh %__rm tools/install/create_fpc_deb.sh @@ -92,10 +103,22 @@ fi const RevisionStr = 'Unknown'; EOF -%__make tools OPT="$MAKEOPTS" -%__make bigide OPT="$MAKEOPTS" USESVN2REVISIONINC=0 +%__make tools OPT="$MAKEOPTS -k-build-id" +%__make bigide OPT="$MAKEOPTS" USESVN2REVISIONINC=0 %__make lazbuilder OPT="$MAKEOPTS" +# build Qt4 interface +pushd lcl/interfaces/qt + %__make all \ + LCL_PLATFORM=qt \ + OPT="-dUSE_QT_45 \ + -dQT_NATIVE_DIALOGS" +popd + +cd lcl/interfaces/gtk2 +make PREFIX=%{_prefix} clean all LCL_PLATFORM=gtk2 +cd ../../../ + # add the ability to create gtk2-applications build gtk2.ppu export LCL_PLATFORM=gtk2 %__make lcl ideintf packager/registration bigidecomponents OPT="$MAKEOPTS" @@ -104,8 +127,10 @@ export LCL_PLATFORM= %install %makeinstall \ INSTALL_PREFIX=%{buildroot}%{_prefix} \ - _LIB=%{_lib} - + _LIB=%{_lib} \ + PREFIX=%{_prefix} \ + clean all \ + LCL_PLATFORM=gtk2 # man-page %__make -C install/man \ INSTALL_MANDIR=%{buildroot}%{_mandir} @@ -121,6 +146,8 @@ ln -sf ../%{_lib}/%{name}/startlazarus \ ln -sf ../%{_lib}/%{name}/lazbuild \ %{buildroot}%{_bindir}/lazbuild +%__install -dm 755 %{buildroot}%{_libdir}/%{name}/tools + # collect docs and samples %__install -dm 755 %{buildroot}%{_defaultdocdir}/%{name} %__mv %{buildroot}%{_libdir}/%{name}/examples \ @@ -139,7 +166,9 @@ ln -s %{_defaultdocdir}/%{name}/examples \ %__install -dm 755 %{buildroot}%{_datadir}/applications %__install -m 644 %{SOURCE1} \ %{buildroot}%{_datadir}/applications/%{name}.desktop +%if 0%{?suse_version} %suse_update_desktop_file -n %{name} Development IDE +%endif # mime info %__install -dm 755 %{buildroot}%{_datadir}/mime/packages @@ -157,27 +186,32 @@ ln -s %{_defaultdocdir}/%{name}/examples \ %__cp %{buildroot}%{_sysconfdir}/%{name}/environmentoptions.xml \ %{buildroot}%{_libdir}/%{name}/tools/install/linux -# fix rights -%__chmod 755 %{buildroot}%{_libdir}/%{name}/components/lazreport/tools/localize.sh -%__chmod 755 %{buildroot}%{_libdir}/%{name}/tools/install/macosx/uninstall.sh +# fix encoding +for file in $(find %{buildroot}%{_defaultdocdir}/%{name}/examples -type f); do + sed -i 's/\r$//' $file +done +# cleanup %__rm -rf %{buildroot}%{_libdir}/%{name}/install/man +%if 0%{?suse_version} %fdupes -s %{buildroot} - -%__chmod 644 %{buildroot}%{_libdir}/%{name}/tools/chmmaker/chmwriter.lpi -%__chmod 644 %{buildroot}%{_libdir}/%{name}/tools/chmmaker/unit1.lfm -%__chmod 644 %{buildroot}%{_libdir}/%{name}/tools/chmmaker/unit1.lrs -%__chmod 644 %{buildroot}%{_libdir}/%{name}/tools/chmmaker/unit1.pas -%__chmod 755 %{buildroot}%{_libdir}/%{name}/components/lazsvnpkg/lazsvnpkg_images.sh +%endif %clean [ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}" %post -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +if [ -x %{_bindir}/update-mime-database ]; then + %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +fi %postun -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +if [ -x %{_bindir}/update-mime-database ]; then + %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +fi +%if 0%{?fedora_version} +update-desktop-database &> /dev/null ||: +%endif %files %defattr(-,root,root,-) @@ -197,32 +231,3 @@ ln -s %{_defaultdocdir}/%{name}/examples \ %{_datadir}/mime/packages/%{name}.xml %changelog -* Tue Nov 03 2009 Toni Graffy - 0.9.28.2-1.pm.1 -- fixed configfile environmentoptions.xml -* Sun Nov 01 2009 Toni Graffy - 0.9.28.2-0.pm.1 -- update to 0.9.28.2 -- This release fixes compiling a test application without saving (missing - project1.lrs). The Lazarus directory is now set correctly by the deb package. - Some other small fixes are also included. -* Tue Oct 27 2009 Toni Graffy - 0.9.28-0.pm.1 -- update to 0.9.28 -- In this major release, the IDE has many source editor improvements like display - of "double width" fonts (such as Eastern, Japanese, Chinese, and Arabic), better - code folding, highlighting, syncro editing, and persistent blocks. The debugger - has assembler windows, easier exception handling, and breakpoint properties. The - LCL now uses GTK2 as the default widgetset on Linux and BSD and includes the - TMonitor class for multi-monitor support. Refactoring of LCL reduced the minimum - size of executables by about 15%. The support of TFrame support has improved, so - you can visually nest designers in the IDE. -* Mon May 04 2009 Toni Graffy - 0.9.26.2-0.pm.3 -- rebuild against fpc-2.2.4 -* Mon Mar 23 2009 Toni Graffy - 0.9.26.2-0.pm.2 -- update to 0.9.26.2 (release-tarball) -* Sat Feb 28 2009 Toni Graffy - 0.9.26.2-0.pm.1 -- update to 0.9.26.2 - svn co https://lazarus.svn.sourceforge.net/svnroot/lazarus/tags/lazarus_0_9_26_2 lazarus -* Sat Nov 01 2008 Toni Graffy - 0.9.26-0.pm.2 -- rebuild against fpc-2.2.2-0.pm.2 -* Thu Oct 30 2008 Toni Graffy - 0.9.26-0.pm.1 -- initial build for packman (fpc-2.2.2 is working with this version) -- based on fedora spec-file from Lubomir Rintel