diff options
27 files changed, 101 insertions, 102 deletions
diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add index 80fa4dee86..9960e0641f 100644 --- a/scripts/binutils/base-binutils.add +++ b/scripts/binutils/base-binutils.add @@ -2,19 +2,19 @@ # ============================================================== # rtems-base-binutils # ============================================================== -%package -n %{rpmprefix}rtems@osversion@-base-binutils +%package -n @rpmprefix@rtems@osversion@-base-binutils Summary: base package for rtems binutils Group: %{rpmgroup} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -%description -n %{rpmprefix}rtems@osversion@-base-binutils +%description -n @rpmprefix@rtems@osversion@-base-binutils RTEMS is an open source operating system for embedded systems. This is the base for binutils regardless of target CPU. -%post -n %{rpmprefix}rtems@osversion@-base-binutils +%post -n @rpmprefix@rtems@osversion@-base-binutils /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz @@ -24,7 +24,7 @@ This is the base for binutils regardless of target CPU. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gasp.info.gz %endif -%preun -n %{rpmprefix}rtems@osversion@-base-binutils +%preun -n @rpmprefix@rtems@osversion@-base-binutils if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz @@ -36,7 +36,7 @@ if [ $1 -eq 0 ]; then %endif fi -%files -n %{rpmprefix}rtems@osversion@-base-binutils +%files -n @rpmprefix@rtems@osversion@-base-binutils %defattr(-,root,root) %dir %{_infodir} %ghost %{_infodir}/dir diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index 2e4d6112f2..55f7f7cf9f 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -2,7 +2,7 @@ %define binutils_version @binutils_version@ %define binutils_target @target_alias@ -Name: %{rpmprefix}%{binutils_target}-binutils +Name: @rpmprefix@%{binutils_target}-binutils Summary: binutils for target %{binutils_target} Group: %{rpmgroup} Release: @Release@ diff --git a/scripts/binutils/target-binutils.add b/scripts/binutils/target-binutils.add index 4032a456d2..3859376f83 100644 --- a/scripts/binutils/target-binutils.add +++ b/scripts/binutils/target-binutils.add @@ -1,18 +1,18 @@ # ============================================================== # %{binutils_target}-binutils # ============================================================== -# %package -n %{rpmprefix}%{binutils_target}-binutils +# %package -n @rpmprefix@%{binutils_target}-binutils # Summary: rtems binutils for %{binutils_target} # Group: %{rpmgroup} -# Requires: %{rpmprefix}rtems@osversion@-base-binutils +# Requires: @rpmprefix@rtems@osversion@-base-binutils -%description -n %{rpmprefix}%{binutils_target}-binutils +%description -n @rpmprefix@%{binutils_target}-binutils RTEMS is an open source operating system for embedded systems. This is the GNU binutils for RTEMS targetting %{binutils_target}. -%files -n %{rpmprefix}%{binutils_target}-binutils +%files -n @rpmprefix@%{binutils_target}-binutils %defattr(-,root,root) %if "%{_prefix}" != "/usr" %dir %{_mandir} diff --git a/scripts/common/common.add.in b/scripts/common/common.add.in index 30dcc205a9..e0d7c91587 100644 --- a/scripts/common/common.add.in +++ b/scripts/common/common.add.in @@ -10,7 +10,6 @@ %define _mandir %{_prefix}/man %endif -%define rpmprefix @rpmprefix@ %define rpmgroup @rpmgroup@ %ifos cygwin cygwin32 diff --git a/scripts/cpukit/rtems-cpukit.add b/scripts/cpukit/rtems-cpukit.add index d962021dfb..4a3b58bf08 100644 --- a/scripts/cpukit/rtems-cpukit.add +++ b/scripts/cpukit/rtems-cpukit.add @@ -2,17 +2,17 @@ %define rtems_target @target_alias@ %define rpmvers %{expand: %%(echo %rtems_version | tr - _ )} -Name: %{rpmprefix}@target_alias@-cpukit +Name: @rpmprefix@@target_alias@-cpukit Release: @Release@ License: Various, Open Source. Group: %{rpmgroup} Packager: ralf.corsepius@rtems.org and joel@OARcorp.com -BuildRequires: %{rpmprefix}%{rtems_target}-binutils -BuildRequires: %{rpmprefix}%{rtems_target}-gcc +BuildRequires: @rpmprefix@%{rtems_target}-binutils +BuildRequires: @rpmprefix@%{rtems_target}-gcc -Requires: %{rpmprefix}%{rtems_target}-binutils -Requires: %{rpmprefix}%{rtems_target}-gcc +Requires: @rpmprefix@%{rtems_target}-binutils +Requires: @rpmprefix@%{rtems_target}-gcc # These are target libs, arch doesn't matter for the host BuildArch: noarch diff --git a/scripts/cpukit/target-cpukit.add b/scripts/cpukit/target-cpukit.add index 635326e5fd..13be0841bb 100644 --- a/scripts/cpukit/target-cpukit.add +++ b/scripts/cpukit/target-cpukit.add @@ -1,10 +1,10 @@ # ============================================================== # @target_alias@-cpukit # ============================================================== -# %package -n %{rpmprefix}@target_alias@-cpukit +# %package -n @rpmprefix@@target_alias@-cpukit # Summary: rtems cpukit for @target_alias@ # Group: %{rpmgroup} -# Requires: %{rpmprefix}@target_alias@-gcc +# Requires: @rpmprefix@@target_alias@-gcc %files %{_prefix}/%{rtems_target} diff --git a/scripts/gccnewlib/base-g77.add b/scripts/gccnewlib/base-g77.add index 7b98baf363..0fa9e64763 100644 --- a/scripts/gccnewlib/base-g77.add +++ b/scripts/gccnewlib/base-g77.add @@ -3,7 +3,7 @@ # ============================================================== # rtems-base-g77 # ============================================================== -%package -n %{rpmprefix}rtems@osversion@-base-g77 +%package -n @rpmprefix@rtems@osversion@-base-g77 Summary: rtems base package for gcc/g77 compiler Group: %{rpmgroup} Version: %{gcc_version} @@ -11,21 +11,21 @@ Version: %{gcc_version} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -%description -n %{rpmprefix}rtems@osversion@-base-g77 +%description -n @rpmprefix@rtems@osversion@-base-g77 RTEMS is an open source operating system for embedded systems. This is the files for gcc/g77 that are shared by all targets. -%files -n %{rpmprefix}rtems@osversion@-base-g77 +%files -n @rpmprefix@rtems@osversion@-base-g77 %defattr(-,root,root) %dir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/g77.info*.gz -%post -n %{rpmprefix}rtems@osversion@-base-g77 +%post -n @rpmprefix@rtems@osversion@-base-g77 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/g77.info.gz -%preun -n %{rpmprefix}rtems@osversion@-base-g77 +%preun -n @rpmprefix@rtems@osversion@-base-g77 if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/g77.info.gz fi diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add index a2adbf6c45..a4e2667185 100644 --- a/scripts/gccnewlib/base-gcc.add +++ b/scripts/gccnewlib/base-gcc.add @@ -1,8 +1,8 @@ %if "%{_prefix}" != "/usr" # ============================================================== -# %{rpmprefix}rtems@osversion@-base-gcc +# @rpmprefix@rtems@osversion@-base-gcc # ============================================================== -%package -n %{rpmprefix}rtems@osversion@-base-gcc +%package -n @rpmprefix@rtems@osversion@-base-gcc Summary: base package for rtems gcc and newlib C Library Group: %{rpmgroup} Version: %{gcc_version} @@ -10,13 +10,13 @@ Version: %{gcc_version} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -%description -n %{rpmprefix}rtems@osversion@-base-gcc +%description -n @rpmprefix@rtems@osversion@-base-gcc RTEMS is an open source operating system for embedded systems. This is the files for gcc and newlib that are shared by all targets. -%files -n %{rpmprefix}rtems@osversion@-base-gcc +%files -n @rpmprefix@rtems@osversion@-base-gcc %defattr(-,root,root) %dir %{_infodir} %ghost %{_infodir}/dir @@ -41,7 +41,7 @@ This is the files for gcc and newlib that are shared by all targets. %{_mandir}/man7/gfdl.7* %{_mandir}/man7/gpl.7* -%post -n %{rpmprefix}rtems@osversion@-base-gcc +%post -n @rpmprefix@rtems@osversion@-base-gcc /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz @@ -52,7 +52,7 @@ This is the files for gcc and newlib that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz %endif -%preun -n %{rpmprefix}rtems@osversion@-base-gcc +%preun -n @rpmprefix@rtems@osversion@-base-gcc if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz diff --git a/scripts/gccnewlib/base-gcj.add b/scripts/gccnewlib/base-gcj.add index 0cc71f1fbb..2aa4f9c106 100644 --- a/scripts/gccnewlib/base-gcj.add +++ b/scripts/gccnewlib/base-gcj.add @@ -3,7 +3,7 @@ # ============================================================== # rtems-base-gcj # ============================================================== -%package -n %{rpmprefix}rtems@osversion@-base-gcj +%package -n @rpmprefix@rtems@osversion@-base-gcj Summary: base package for rtems gcc/java compiler (gcj). Group: %{rpmgroup} Version: %{gcc_version} @@ -11,12 +11,12 @@ Version: %{gcc_version} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -%description -n %{rpmprefix}rtems@osversion@-base-gcj +%description -n @rpmprefix@rtems@osversion@-base-gcj RTEMS is an open source operating system for embedded systems. This is the files for gcc/java (gcj) that are shared by all targets. -%files -n %{rpmprefix}rtems@osversion@-base-gcj +%files -n @rpmprefix@rtems@osversion@-base-gcj %defattr(-,root,root) %if "%{gcc_version}" <= "3.4" %dir %{_bindir} @@ -47,14 +47,14 @@ This is the files for gcc/java (gcj) that are shared by all targets. %endif %endif -%post -n %{rpmprefix}rtems@osversion@-base-gcj +%post -n @rpmprefix@rtems@osversion@-base-gcj /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcj.info* %if "%{gcc_version}" >= "3.3" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* %endif -%preun -n %{rpmprefix}rtems@osversion@-base-gcj +%preun -n @rpmprefix@rtems@osversion@-base-gcj if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info* diff --git a/scripts/gccnewlib/base-gfortran.add b/scripts/gccnewlib/base-gfortran.add index 320506d032..e2709cc2c4 100644 --- a/scripts/gccnewlib/base-gfortran.add +++ b/scripts/gccnewlib/base-gfortran.add @@ -3,28 +3,28 @@ # ============================================================== # rtems-base-gfortran # ============================================================== -%package -n %{rpmprefix}rtems@osversion@-base-gfortran +%package -n @rpmprefix@rtems@osversion@-base-gfortran Summary: rtems base package for gcc/gfortran compiler Group: %{rpmgroup} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -%description -n %{rpmprefix}rtems@osversion@-base-gfortran +%description -n @rpmprefix@rtems@osversion@-base-gfortran RTEMS is an open source operating system for embedded systems. This is the files for gcc/gfortran that are shared by all targets. -%files -n %{rpmprefix}rtems@osversion@-base-gfortran +%files -n @rpmprefix@rtems@osversion@-base-gfortran %defattr(-,root,root) %dir %{_infodir} %ghost %{_infodir}/dir %{_infodir}/gfortran.info*.gz -%post -n %{rpmprefix}rtems@osversion@-base-gfortran +%post -n @rpmprefix@rtems@osversion@-base-gfortran /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz -%preun -n %{rpmprefix}rtems@osversion@-base-gfortran +%preun -n @rpmprefix@rtems@osversion@-base-gfortran if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz fi diff --git a/scripts/gccnewlib/base-gnat.add b/scripts/gccnewlib/base-gnat.add index e9672c1270..d335f655c8 100644 --- a/scripts/gccnewlib/base-gnat.add +++ b/scripts/gccnewlib/base-gnat.add @@ -3,19 +3,19 @@ # ============================================================== # rtems-base-gnat # ============================================================== -%package -n %{rpmprefix}rtems@osversion@-base-gnat +%package -n @rpmprefix@rtems@osversion@-base-gnat Summary: gcc/gnat tools Group: %{rpmgroup} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -%description -n %{rpmprefix}rtems@osversion@-base-gnat +%description -n @rpmprefix@rtems@osversion@-base-gnat RTEMS is an open source operating system for embedded systems. This is the gcc/gnat tools for the gcc/gnat compiler -%files -n %{rpmprefix}rtems@osversion@-base-gnat +%files -n @rpmprefix@rtems@osversion@-base-gnat %defattr(-,root,root) %dir %{_bindir} %{_bindir}/vxaddr2line%{_exeext} @@ -24,12 +24,12 @@ This is the gcc/gnat tools for the gcc/gnat compiler %ghost %{_infodir}/dir %{_infodir}/gnat* -%post -n %{rpmprefix}rtems@osversion@-base-gnat +%post -n @rpmprefix@rtems@osversion@-base-gnat /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz -%preun -n %{rpmprefix}rtems@osversion@-base-gnat +%preun -n @rpmprefix@rtems@osversion@-base-gnat if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add index e7a6a88ecc..3d098b5993 100644 --- a/scripts/gccnewlib/gccnewlib.add +++ b/scripts/gccnewlib/gccnewlib.add @@ -5,7 +5,7 @@ %define gcc_target @target_alias@ -Name: %{rpmprefix}%{gcc_target}-gcc-newlib +Name: @rpmprefix@%{gcc_target}-gcc-newlib Summary: gcc and newlib C Library for %{gcc_target}. Group: %{rpmgroup} Release: @Release@ @@ -23,7 +23,7 @@ Source99: brp-rtems-compress.in %define __os_install_post ./brp-rtems-compress && ./brp-rtems-strip BuildRequires: texinfo >= 4.2 -BuildRequires: %{rpmprefix}%{gcc_target}-binutils +BuildRequires: @rpmprefix@%{gcc_target}-binutils # @@ -124,7 +124,7 @@ BuildRequires: zlib-devel # This really isn't available until RedHat 8.0. How to conditionalize this? BuildRequires: gcc-gnat # Urgh, building gnat requires the target c-toolchain -BuildRequires: %{rpmprefix}%{gcc_target}-gcc < %{gccnewlib_version}-%{release} +BuildRequires: @rpmprefix@%{gcc_target}-gcc < %{gccnewlib_version}-%{release} %endif %if %build_f95 BuildRequires: gmp-devel diff --git a/scripts/gccnewlib/target-c++.add b/scripts/gccnewlib/target-c++.add index 3ecb5d64c3..70cc422cd6 100644 --- a/scripts/gccnewlib/target-c++.add +++ b/scripts/gccnewlib/target-c++.add @@ -2,21 +2,21 @@ # ============================================================== # %{gcc_target}-c++ # ============================================================== -%package -n %{rpmprefix}%{gcc_target}-c++ +%package -n @rpmprefix@%{gcc_target}-c++ Summary: gcc/g++ compiler (c++) for %{gcc_target} Group: %{rpmgroup} Version: %{gcc_version} %if "%{_prefix}" != "/usr" -Requires: %{rpmprefix}rtems@osversion@-base-gcc +Requires: @rpmprefix@rtems@osversion@-base-gcc %endif -Requires: %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release} +Requires: @rpmprefix@%{gcc_target}-gcc = %{gcc_version}-%{release} -%description -n %{rpmprefix}%{gcc_target}-c++ +%description -n @rpmprefix@%{gcc_target}-c++ RTEMS is an open source operating system for embedded systems. This is the gcc/g++ compiler for %{gcc_target} -%files -n %{rpmprefix}%{gcc_target}-c++ -f build/files.g++ +%files -n @rpmprefix@%{gcc_target}-c++ -f build/files.g++ %defattr(-,root,root) %{_mandir}/man1/%{gcc_target}-g++.1* diff --git a/scripts/gccnewlib/target-g77.add b/scripts/gccnewlib/target-g77.add index 7133081a85..3a511ee2c5 100644 --- a/scripts/gccnewlib/target-g77.add +++ b/scripts/gccnewlib/target-g77.add @@ -2,19 +2,19 @@ # ============================================================== # %{gcc_target}-g77 # ============================================================== -%package -n %{rpmprefix}%{gcc_target}-g77 +%package -n @rpmprefix@%{gcc_target}-g77 Summary: gcc/g77 compiler for %{gcc_target} Group: %{rpmgroup} Version: %{gcc_version} -Requires: %{rpmprefix}rtems@osversion@-base-g77 -Requires: %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release} +Requires: @rpmprefix@rtems@osversion@-base-g77 +Requires: @rpmprefix@%{gcc_target}-gcc = %{gcc_version}-%{release} -%description -n %{rpmprefix}%{gcc_target}-g77 +%description -n @rpmprefix@%{gcc_target}-g77 RTEMS is an open source operating system for embedded systems. This is the gcc/g77 compiler for %{gcc_target} -%files -n %{rpmprefix}%{gcc_target}-g77 -f build/files.g77 +%files -n @rpmprefix@%{gcc_target}-g77 -f build/files.g77 %defattr(-,root,root) %{_bindir}/%{gcc_target}-g77%{_exeext} diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add index 32372a16d2..d9872f2f87 100644 --- a/scripts/gccnewlib/target-gcc.add +++ b/scripts/gccnewlib/target-gcc.add @@ -1,19 +1,19 @@ # ============================================================== # %{gcc_target}-gcc # ============================================================== -%package -n %{rpmprefix}%{gcc_target}-gcc +%package -n @rpmprefix@%{gcc_target}-gcc Summary: rtems gcc and newlib C Library for %{gcc_target} Group: %{rpmgroup} Version: %{gcc_version} -Requires: %{rpmprefix}%{gcc_target}-binutils -Requires: %{rpmprefix}%{gcc_target}-libc = %{newlib_version}-%{release} +Requires: @rpmprefix@%{gcc_target}-binutils +Requires: @rpmprefix@%{gcc_target}-libc = %{newlib_version}-%{release} -%description -n %{rpmprefix}%{gcc_target}-gcc +%description -n @rpmprefix@%{gcc_target}-gcc RTEMS is an open source operating system for embedded systems. This is gcc for %{gcc_target}. -%files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc +%files -n @rpmprefix@%{gcc_target}-gcc -f build/files.gcc %defattr(-,root,root) %if "%{_prefix}" != "/usr" %dir %{_mandir} diff --git a/scripts/gccnewlib/target-gcj.add b/scripts/gccnewlib/target-gcj.add index ef77aa36df..60c0ca2daa 100644 --- a/scripts/gccnewlib/target-gcj.add +++ b/scripts/gccnewlib/target-gcj.add @@ -2,21 +2,21 @@ # ============================================================== # %{gcc_target}-gcj # ============================================================== -%package -n %{rpmprefix}%{gcc_target}-gcj +%package -n @rpmprefix@%{gcc_target}-gcj Summary: gcc/java compiler (gcj) for %{gcc_target} Group: %{rpmgroup} Version: %{gcc_version} %if "%{_prefix}" != "/usr" -Requires: %{rpmprefix}rtems@osversion@-base-gcj +Requires: @rpmprefix@rtems@osversion@-base-gcj %endif -Requires: %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release} +Requires: @rpmprefix@%{gcc_target}-gcc = %{gcc_version}-%{release} -%description -n %{rpmprefix}%{gcc_target}-gcj +%description -n @rpmprefix@%{gcc_target}-gcj RTEMS is an open source operating system for embedded systems. This is the gcc/java compiler for %{gcc_target} -%files -n %{rpmprefix}%{gcc_target}-gcj -f build/files.gcj +%files -n @rpmprefix@%{gcc_target}-gcj -f build/files.gcj %defattr(-,root,root) %{_bindir}/%{gcc_target}-gcj%{_exeext} %{_bindir}/%{gcc_target}-jcf-dump%{_exeext} diff --git a/scripts/gccnewlib/target-gfortran.add b/scripts/gccnewlib/target-gfortran.add index d0e28e91fb..76767c93bc 100644 --- a/scripts/gccnewlib/target-gfortran.add +++ b/scripts/gccnewlib/target-gfortran.add @@ -2,22 +2,22 @@ # ============================================================== # %{gcc_target}-gfortran # ============================================================== -%package -n %{rpmprefix}%{gcc_target}-gfortran +%package -n @rpmprefix@%{gcc_target}-gfortran Summary: gcc/gfortran compiler for %{gcc_target} Group: %{rpmgroup} Version: %{gcc_version} %if "%{_prefix}" != "/usr" -Requires: %{rpmprefix}rtems@osversion@-base-gfortran +Requires: @rpmprefix@rtems@osversion@-base-gfortran %endif -Requires: %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release} -Obsoletes: %{rpmprefix}%{gcc_target}-g77 +Requires: @rpmprefix@%{gcc_target}-gcc = %{gcc_version}-%{release} +Obsoletes: @rpmprefix@%{gcc_target}-g77 -%description -n %{rpmprefix}%{gcc_target}-gfortran +%description -n @rpmprefix@%{gcc_target}-gfortran RTEMS is an open source operating system for embedded systems. This is the gcc/gfortran compiler for %{gcc_target} -%files -n %{rpmprefix}%{gcc_target}-gfortran -f build/files.gfortran +%files -n @rpmprefix@%{gcc_target}-gfortran -f build/files.gfortran %defattr(-,root,root) %{_bindir}/%{gcc_target}-gfortran%{_exeext} diff --git a/scripts/gccnewlib/target-gnat.add b/scripts/gccnewlib/target-gnat.add index 8adeb1205c..cac314fab2 100644 --- a/scripts/gccnewlib/target-gnat.add +++ b/scripts/gccnewlib/target-gnat.add @@ -2,21 +2,21 @@ # ============================================================== # %{gcc_target}-gnat # ============================================================== -%package -n %{rpmprefix}%{gcc_target}-gnat +%package -n @rpmprefix@%{gcc_target}-gnat Summary: gcc/gnat compiler for %{gcc_target} Group: %{rpmgroup} Version: %{gcc_version} %if "%{_prefix}" != "/usr" -Requires: %{rpmprefix}rtems@osversion@-base-gnat +Requires: @rpmprefix@rtems@osversion@-base-gnat %endif -Requires: %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release} +Requires: @rpmprefix@%{gcc_target}-gcc = %{gcc_version}-%{release} -%description -n %{rpmprefix}%{gcc_target}-gnat +%description -n @rpmprefix@%{gcc_target}-gnat RTEMS is an open source operating system for embedded systems. This is the gcc/gnat compiler for %{gcc_target} -%files -n %{rpmprefix}%{gcc_target}-gnat +%files -n @rpmprefix@%{gcc_target}-gnat %defattr(-,root,root) %{_bindir}/%{gcc_target}-gnat* %{_bindir}/%{gcc_target}-gprmake%{_exeext} diff --git a/scripts/gccnewlib/target-libc.add b/scripts/gccnewlib/target-libc.add index 195d62b4df..d8777bc95b 100644 --- a/scripts/gccnewlib/target-libc.add +++ b/scripts/gccnewlib/target-libc.add @@ -1,19 +1,19 @@ # ============================================================== # %{gcc_target}-libc # ============================================================== -%package -n %{rpmprefix}%{gcc_target}-libc +%package -n @rpmprefix@%{gcc_target}-libc Summary: newlib C Library for %{gcc_target} Group: %{rpmgroup} License: Distributable Version: %{newlib_version} -Provides: %{rpmprefix}%{gcc_target}-newlib = %{newlib_version}-%{release} +Provides: @rpmprefix@%{gcc_target}-newlib = %{newlib_version}-%{release} -%description -n %{rpmprefix}%{gcc_target}-libc +%description -n @rpmprefix@%{gcc_target}-libc RTEMS is an open source operating system for embedded systems. This is the newlib C Library for %{gcc_target}. -%files -n %{rpmprefix}%{gcc_target}-libc -f build/files.libc +%files -n @rpmprefix@%{gcc_target}-libc -f build/files.libc %defattr(-,root,root) %if "%{_prefix}" != "/usr" %dir %{_prefix} diff --git a/scripts/gccnewlib/target-objc.add b/scripts/gccnewlib/target-objc.add index 2636cd1b09..b3ab3d4075 100644 --- a/scripts/gccnewlib/target-objc.add +++ b/scripts/gccnewlib/target-objc.add @@ -2,18 +2,18 @@ # ============================================================== # %{gcc_target}-objc # ============================================================== -%package -n %{rpmprefix}%{gcc_target}-objc +%package -n @rpmprefix@%{gcc_target}-objc Summary: gcc/objc compiler for %{gcc_target} Group: %{rpmgroup} Version: %{gcc_version} -Requires: %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release} +Requires: @rpmprefix@%{gcc_target}-gcc = %{gcc_version}-%{release} -%description -n %{rpmprefix}%{gcc_target}-objc +%description -n @rpmprefix@%{gcc_target}-objc RTEMS is an open source operating system for embedded systems. This is the gcc/objc compiler for %{gcc_target} -%files -n %{rpmprefix}%{gcc_target}-objc -f build/files.objc +%files -n @rpmprefix@%{gcc_target}-objc -f build/files.objc %defattr(-,root,root) %dir %{gccexec} diff --git a/scripts/gdb/base-gdb.add b/scripts/gdb/base-gdb.add index ff7f9874e3..84fe2aef4e 100644 --- a/scripts/gdb/base-gdb.add +++ b/scripts/gdb/base-gdb.add @@ -2,19 +2,19 @@ # rtems-base-gdb # ===================================================================== -%package -n %{rpmprefix}rtems@osversion@-base-gdb +%package -n @rpmprefix@rtems@osversion@-base-gdb Summary: base package for rtems gdb Group: %{rpmgroup} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -%description -n %{rpmprefix}rtems@osversion@-base-gdb +%description -n @rpmprefix@rtems@osversion@-base-gdb RTEMS is an open source operating system for embedded systems. This is the base for gdb regardless of target CPU. -%files -n %{rpmprefix}rtems@osversion@-base-gdb +%files -n @rpmprefix@rtems@osversion@-base-gdb %defattr(-,root,root) %dir %{_infodir} @@ -38,7 +38,7 @@ This is the base for gdb regardless of target CPU. %dir %{_mandir} %dir %{_mandir}/man1 -%post -n %{rpmprefix}rtems@osversion@-base-gdb +%post -n @rpmprefix@rtems@osversion@-base-gdb /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz %if "%{gdb_version}" < "6.3" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz @@ -51,7 +51,7 @@ This is the base for gdb regardless of target CPU. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz %endif -%preun -n %{rpmprefix}rtems@osversion@-base-gdb +%preun -n @rpmprefix@rtems@osversion@-base-gdb if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz %if "%{gdb_version}" < "6.3" diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add index 688164e3f8..f908c0bf93 100644 --- a/scripts/gdb/gdb.add +++ b/scripts/gdb/gdb.add @@ -2,7 +2,7 @@ %define gdb_version @gdb_version@ %define gdb_target @target_alias@ -Name: %{rpmprefix}%{gdb_target}-gdb +Name: @rpmprefix@%{gdb_target}-gdb Release: @Release@ License: GPL/LGPL Group: %{rpmgroup} diff --git a/scripts/gdb/target-gdb.add b/scripts/gdb/target-gdb.add index 1207052595..1df94c5b4c 100644 --- a/scripts/gdb/target-gdb.add +++ b/scripts/gdb/target-gdb.add @@ -1,18 +1,18 @@ # ===================================================================== # %{gdb_target}-gdb # ===================================================================== -# %package -n %{rpmprefix}%{gdb_target}-gdb +# %package -n @rpmprefix@%{gdb_target}-gdb # Summary: rtems gdb for %{gdb_target} # Group: %{rpmgroup} -# Requires: %{rpmprefix}rtems@osversion@-base-gdb +# Requires: @rpmprefix@rtems@osversion@-base-gdb -%description -n %{rpmprefix}%{gdb_target}-gdb +%description -n @rpmprefix@%{gdb_target}-gdb RTEMS is an open source operating system for embedded systems. This is the GNU gdb for RTEMS targetting %{gdb_target}. -%files -n %{rpmprefix}%{gdb_target}-gdb +%files -n @rpmprefix@%{gdb_target}-gdb %defattr(-,root,root) %{_mandir}/man1/%{gdb_target}-gdb.1* %if "%_sim" == "1" diff --git a/scripts/rtems/rtems-source.add b/scripts/rtems/rtems-source.add index ff3818dde7..38574442bb 100644 --- a/scripts/rtems/rtems-source.add +++ b/scripts/rtems/rtems-source.add @@ -1,4 +1,4 @@ -Name: %{rpmprefix}rtems-source +Name: @rpmprefix@rtems-source Version: @rtems_version@ Release: @RTEMS_RPM_RELEASE@ Epoch: 0 @@ -12,8 +12,8 @@ Prefix: %{_prefix}/src BuildArch: noarch #--------------------------------------------------------------------- -Requires: %{rpmprefix}automake-rtems = 1.8.2 -Requires: %{rpmprefix}autoconf-rtems = 2.59 +Requires: @rpmprefix@automake-rtems = 1.8.2 +Requires: @rpmprefix@autoconf-rtems = 2.59 %description RTEMS is an open source operating system for embedded systems. diff --git a/scripts/rtemsdoc/rtemsdoc.add b/scripts/rtemsdoc/rtemsdoc.add index 4a70f08960..828d791894 100644 --- a/scripts/rtemsdoc/rtemsdoc.add +++ b/scripts/rtemsdoc/rtemsdoc.add @@ -4,7 +4,7 @@ %define srcvers @rtems_version@ %define rpmvers %{expand:%%(echo @rtems_version@ | tr - _ )} -Name: %{rpmprefix}rtemsdoc +Name: @rpmprefix@rtemsdoc Release: @rtems_rpm_release@ Epoch: 0 License: Distributable diff --git a/scripts/rtemsdoc/supplement.add.in b/scripts/rtemsdoc/supplement.add.in index 72143e8575..c556a9025a 100644 --- a/scripts/rtemsdoc/supplement.add.in +++ b/scripts/rtemsdoc/supplement.add.in @@ -5,7 +5,7 @@ Summary: Documentation for RTEMS @target@ support Group: %{rpmgroup}/Documentation Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -Requires: %{rpmprefix}rtemsdoc-base +Requires: @rpmprefix@rtemsdoc-base %description @target@ RTEMS is a free operating system for embedded systems. diff --git a/scripts/rtemsdoc/templ.add.in b/scripts/rtemsdoc/templ.add.in index a528d4743b..48d789eead 100644 --- a/scripts/rtemsdoc/templ.add.in +++ b/scripts/rtemsdoc/templ.add.in @@ -5,7 +5,7 @@ Summary: Documentation for RTEMS @target@ support Group: %{rpmgroup}/Documentation Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -Requires: %{rpmprefix}rtemsdoc-base +Requires: @rpmprefix@rtemsdoc-base %description @target@ RTEMS is a free operating system for embedded systems. |