increased rpm version to 0.9.2.3

git-svn-id: trunk@6231 -

install/gnome.ide.desktop

@@ -7,6 +7,7 @@ Name[da]=Lazarus
 Name[de]=Lazarus
 Name[el]=Lazarus
 Name[es]=Lazarus
+Name[fi]=Lazarus
 Name[fr]=Lazarus
 Name[ga]=Lazarus
 Name[hu]=Lazarus
@@ -28,7 +29,12 @@ Name[tr]=Lazarus
 Name[uk]=Lazarus
 Name[zh_CN]=Lazarus
 Comment=Lazarus IDE
-Exec=lazarus
+Exec=lazarus %f
 Terminal=0
 Type=Application
 Icon=lazarus.png
+Encoding=UTF-8
+Categories=IDE;Development;X-Red-Hat-Base;Application;
+StartupWMClass=Lazarus
+MimeType=text/x-pascal;
+

tools/install/build_fpcsrc_rpm.sh

@@ -47,7 +47,7 @@ FPCTGZ=fpcsrc-$LazVersion-$LazRelease.tgz
 CurDir=`pwd`
 
 # pack the directory
-sh create_fpc_tgz_from_local_dir.sh $FPCSourceDir $FPCTGZ
+sh create_fpc_tgz_from_local_dir.sh renamesmart $FPCSourceDir $FPCTGZ
 
 if [ "$PkgType" = "deb" ]; then
   # build fpcsrc deb

tools/install/create_fpc_tgz_from_local_dir.sh

@@ -3,27 +3,33 @@
 set -e
 set -x
 
+RenameSmart=no
+if [ "x$1" = "xrenamesmart" ]; then
+  RenameSmart=yes
+  shift
+fi
+
 FPCSrcDir=$1
 OutputFile=$2
 
 FPCSrcDir=$(echo $FPCSrcDir | sed -e 's#//#/#' -e 's#/$##')/
 OutputFile=$(echo $OutputFile | sed -e 's#//#/#' -e 's#/$##')
 
-Usage="Usage: $0 <fpc_source_directory> <outputfile>"
+Usage="Usage: $0 [renamesmart] <fpc_source_directory> <outputfile>"
 
 if [ "x$FPCSrcDir" = "x" ]; then
   echo $Usage
-  exit
+  exit -1
 fi
 
 if [ "x$OutputFile" = "x" ]; then
   echo $Usage
-  exit
+  exit -1
 fi
 
 if [ ! -d $FPCSrcDir/compiler ]; then
   echo "The directory $FPCSrcDir does not look like a fpc source directory (fpc/)"
-  exit
+  exit -1
 fi
 
 TmpBaseDir=/tmp
@@ -35,6 +41,12 @@ rm -rf $TmpDir
 cd -
 sh create_clean_fpcsrc_directory.sh $FPCSrcDir $TmpDir
 
+if [ $RenameSmart = "yes" ]; then
+  for Ext in pm pl; do
+    find $TmpDir -name "*.$Ext" -exec mv {} {}.renamed \;
+  done
+fi
+
 # pack
 echo "creating tgz ..."
 cd $TmpBaseDir

tools/install/create_lazarus_rpm.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#set -x
+set -x
 set -e
 
 # get date of day
@@ -14,9 +14,10 @@ if [ "x$FPCRPM" = "x" ]; then
   echo ERROR: fpc rpm not installed
   exit
 fi
+FPCRPMVersion=`echo $FPCRPM | sed -e 's/fpc-//g'`
 
 Date=$Year$Month$Day
-LazVersion=0.9.2.2
+LazVersion=0.9.2.3
 LazRelease=`echo $FPCRPM | sed -e 's/-/_/g'`
 SrcTGZ=lazarus-$Date.tgz
 TmpDir=/tmp/lazarus$LazVersion
@@ -35,6 +36,8 @@ cat lazarus.spec | \
   sed -e "s/LAZVERSION/$LazVersion/g" \
       -e "s/LAZRELEASE/$LazRelease/" \
       -e "s/LAZSOURCE/$SrcTGZ/" \
+      -e "s/FPCBUILDVERSION/1.0.10/" \
+      -e "s/FPCSRCVERSION/$FPCRPMVersion/" \
   > $SpecFile
 
 # build rpm

tools/install/lazarus.spec

@@ -8,8 +8,8 @@ Summary: Lazarus Component Library and IDE
 Packager: Mattias Gaertner (mattias@freepascal.org)
 URL: http://www.lazarus.freepascal.org/
 BuildRoot: %{_tmppath}/lazarus-build
-BuildRequires: fpc >= 1.0.10
-Requires: fpcsrc >= 1.0.10
+BuildRequires: fpc >= FPCBUILDVERSION
+Requires: fpcsrc >= FPCSRCVERSION, fpc >= FPCBUILDVERSION
 Requires: gdk-pixbuf-devel >= 0.18.0
 
 %define lazdir %{_datadir}/lazarus
@@ -35,9 +35,11 @@ The LCL is licensed under LGPL2, the IDE is licensed under GPL2.
   mkdir -p %{buildroot}%{_bindir}
   mkdir -p %{buildroot}%{_datadir}/pixmaps
   mkdir -p %{buildroot}%{_datadir}/gnome/apps/Development
+  mkdir -p %{buildroot}%{_datadir}/applications
   cp -a lazarus/* %{buildroot}%{_datadir}/lazarus/
   install -m 644 lazarus/images/ide_icon48x48.png %{buildroot}%{_datadir}/pixmaps/lazarus.png
   install -m 644 lazarus/gnome.ide.desktop %{buildroot}%{_datadir}/gnome/apps/Development/lazarus.desktop
+  install -m 644 lazarus/gnome.ide.desktop %{buildroot}%{_datadir}/applications/lazarus.desktop
   ln -sf %{lazdir}/lazarus %{buildroot}%{_bindir}/lazarus
 
 %clean
@@ -51,6 +53,7 @@ The LCL is licensed under LGPL2, the IDE is licensed under GPL2.
 %{_bindir}/lazarus
 %{_datadir}/pixmaps/lazarus.png
 %{_datadir}/gnome/apps/Development/lazarus.desktop
+%{_datadir}/applications/lazarus.desktop
 
 %changelog