From 766a0082bbc05d5fec2443176b6d4a50f31edd66 Mon Sep 17 00:00:00 2001 From: Joost van der Sluis Date: Sat, 17 Oct 2009 20:24:59 +0000 Subject: [PATCH] - Updated to version 0.9.28 --- .cvsignore | 2 +- gzip_manpages_patch.diff | 9 ++++++++ lazarus.spec | 47 +++++++++++++++++++++------------------- sources | 2 +- 4 files changed, 36 insertions(+), 24 deletions(-) create mode 100644 gzip_manpages_patch.diff diff --git a/.cvsignore b/.cvsignore index cdfad1f..e18d28a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lazarus-0.9.26.2-0.tgz +lazarus-0.9.28-src.tar.bz2 diff --git a/gzip_manpages_patch.diff b/gzip_manpages_patch.diff new file mode 100644 index 0000000..6934696 --- /dev/null +++ b/gzip_manpages_patch.diff @@ -0,0 +1,9 @@ +Index: lazarus/install/man/Makefile +=================================================================== +--- lazarus/install/man/Makefile (revision 22196) ++++ lazarus/install/man/Makefile (working copy) +@@ -31,3 +31,4 @@ + # $(GINSTALL) -d -m 755 $(INSTALL_MANDIR)/man5 + $(GINSTALL) -c -m 644 man1/*.1 $(INSTALL_MANDIR)/man1 + # $(GINSTALL) -c -m 644 man5/*.5 $(INSTALL_MANDIR)/man5 ++ find man1/*.1 -exec gzip -9f $(INSTALL_MANDIR)/'{}' \; diff --git a/lazarus.spec b/lazarus.spec index 5a6f0ac..29e92db 100644 --- a/lazarus.spec +++ b/lazarus.spec @@ -1,61 +1,61 @@ Name: lazarus -Version: 0.9.26.2 -Release: 4%{?dist} +Version: 0.9.28 +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.freepascal.org/ -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-0.tgz +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 patch0: Makefile_patch.diff patch1: Desktop_patch.diff +patch2: gzip_manpages_patch.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: fpc >= 2.2.2, binutils, gdk-pixbuf-devel, gtk+-devel, glibc-devel, desktop-file-utils, gtk2-devel, fpc-src >= 2.2.2 -Requires: fpc-src >= 2.2.2, fpc >= 2.2.2, binutils, gdk-pixbuf-devel, gtk+-devel, glibc-devel, gdb +BuildRequires: fpc, binutils, glibc-devel, desktop-file-utils, fpc-src, gtk2-devel +Requires: fpc-src, fpc, binutils, glibc-devel, gdb, gtk2-devel ExcludeArch: s390 s390x %description -Lazarus is a free and opensource RAD tool for freepascal using the lazarus +A free and opensource RAD tool for freepascal using the lazarus component library - LCL, which is also included in this package. %prep %setup -c -q %patch0 -p0 %patch1 -p0 +%patch2 -p0 %build cd lazarus -# Remove the files for building debian-repositories +# Remove the files for building other packages rm -rf debian -rm -rf tools/install/cross_unix/debian_crosswin32 -rm tools/install/cross_unix/create_linux_cross_win32_deb.sh -rm tools/install/cross_unix/HowToCreate_fpc_crosswin32_deb.txt +cd tools +find install -depth -type d ! \( -path "install/linux/*" -o -path "install/linux" -o -path "install" \) -exec rm -rf '{}' \; +cd .. + # 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 -rm tools/install/create_fpc_export_tgz.sh -rm tools/install/create_fpc_rpm.sh -rm tools/install/create_fpc-src_rpm.sh -rm tools/install/create_fpc_tgz_from_local_dir.sh -rm tools/install/create_lazarus_export_tgz.sh export FPCDIR=%{_datadir}/fpcsrc/ fpcmake -Tall make tools OPT='-gl' make bigide OPT='-gl' make lazbuilder OPT='-gl' -# Add the ability to create gtk2-applications -export LCL_PLATFORM=gtk2 -make lcl ideintf packager/registration bigidecomponents OPT='-gl' -export LCL_PLATFORM= %install rm -rf %{buildroot} + +# These files have the wrong executable-bit set in version 0.9.28: +chmod -x lazarus/tools/chmmaker/chmwriter.lpi +chmod -x lazarus/tools/chmmaker/unit1.pas +chmod -x lazarus/tools/chmmaker/unit1.lfm +chmod -x lazarus/tools/chmmaker/unit1.lrs +chmod +x lazarus/components/lazsvnpkg/lazsvnpkg_images.sh +chmod +x lazarus/examples/trayicon/createbundle.sh + make -C lazarus install INSTALL_PREFIX=%{buildroot}%{_prefix} _LIB=%{_lib} make -C lazarus/install/man INSTALL_MANDIR=%{buildroot}%{_mandir} @@ -101,6 +101,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_mandir}/*/* %changelog +* Fri Oct 16 2009 Joost van der Sluis - 0.9.28-1 +- Updated to version 0.9.28 + * Fri Jul 24 2009 Fedora Release Engineering - 0.9.26.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 5001ed9..ae93a11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -357fd9f6e9d410f3c74ff493fce7f75a lazarus-0.9.26.2-0.tgz +01cebc06ab66c6e34f55b860d00de8bb lazarus-0.9.28-src.tar.bz2