diff --git a/tools/install/create_lazarus_rpm.sh b/tools/install/create_lazarus_rpm.sh index 20f62b4a8a..015b26fa2d 100755 --- a/tools/install/create_lazarus_rpm.sh +++ b/tools/install/create_lazarus_rpm.sh @@ -20,7 +20,7 @@ echo "installed fpc version: $FPCRPMVersion" Date=$Year$Month$Day LazVersion=$(./get_lazarus_version.sh) -LazRelease=$(echo $FPCRPM | sed -e 's/-/_/g') +LazRelease='0' # $(echo $FPCRPM | sed -e 's/-/_/g') Src=lazarus-$LazVersion-$LazRelease.tar.gz SrcTGZ=$(./rpm/get_rpm_source_dir.sh)/SOURCES/$Src TmpDir=/tmp/lazarus$LazVersion @@ -37,9 +37,9 @@ echo "creating lazarus spec file ..." cat rpm/lazarus.spec.template | \ sed -e "s/LAZVERSION/$LazVersion/g" \ -e "s/LAZRELEASE/$LazRelease/g" \ - -e "s/LAZSOURCE/$Src/" \ - -e "s/FPCBUILDVERSION/2.0.0/" \ - -e "s/FPCSRCVERSION/$FPCRPMVersion/" \ + -e "s/LAZSOURCE/$Src/g" \ + -e "s/FPCBUILDVERSION/2.0.0/g" \ + -e "s/FPCVERSION/$FPCRPMVersion/g" \ > $SpecFile # build rpm diff --git a/tools/install/rpm/lazarus.spec.template b/tools/install/rpm/lazarus.spec.template index b4846a6bb5..c76056ffe1 100644 --- a/tools/install/rpm/lazarus.spec.template +++ b/tools/install/rpm/lazarus.spec.template @@ -10,7 +10,7 @@ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}-%{ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: -Requires: fpc-src = FPCVERSION, fpc = FPCVERSION, gdk-pixbuf-devel, gtk+, gtk+-devel, gdb, glibc-devel, gdk-pixbuf +Requires: fpcsrc = FPCVERSION, fpc = FPCVERSION, gdk-pixbuf-devel, gtk+, gtk+-devel, gdb, glibc-devel, gdk-pixbuf Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -28,7 +28,7 @@ MAKEOPTS="-Fl/opt/gnome/lib" if [ -n "$FPCCfg" ]; then MAKEOPTS="$MAKEOPTS -n @$FPCCfg" fi -make OPT="$MAKEOPTS" +make all OPT="$MAKEOPTS" make tools strip lazarus strip startlazarus