diff options
7 files changed, 81 insertions, 69 deletions
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec index e9c6997..e727254 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec @@ -1,9 +1,9 @@ -%define cross_arch arm -%define cross_triplet arm-linux-gnueabi -%define cross_sysroot %{_prefix}/%{cross_triplet}/sys-root +%global cross_arch arm +%global cross_triplet arm-linux-gnueabi +%global cross_sysroot %{_prefix}/%{cross_triplet}/sys-root %if 0%{?_unique_build_ids} -%define _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}" +%global _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}" %endif Name: %{cross_triplet}-binutils @@ -91,6 +91,7 @@ rm -rf %{buildroot}%{_infodir} %changelog * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.29.1-3 - Use autosetup macro +- Replace define with global * Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.29.1-2 - Fix build ID conflict for Fedora 27 and later diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-filesystem/arm-linux-gnueabi-filesystem.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-filesystem/arm-linux-gnueabi-filesystem.spec index 2fe4a9e..1022f64 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-filesystem/arm-linux-gnueabi-filesystem.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-filesystem/arm-linux-gnueabi-filesystem.spec @@ -1,20 +1,20 @@ -%define cross_arch arm -%define cross_triplet arm-linux-gnueabi -%define cross_sysroot %{_prefix}/%{cross_triplet}/sys-root +%global cross_arch arm +%global cross_triplet arm-linux-gnueabi +%global cross_sysroot %{_prefix}/%{cross_triplet}/sys-root %if %{cross_arch} == "arm" - %define lib_dir_name lib + %global lib_dir_name lib %else %if %{cross_arch} == "arm64" - %define lib_dir_name lib64 + %global lib_dir_name lib64 %else - %define lib_dir_name lib + %global lib_dir_name lib %endif %endif Name: %{cross_triplet}-filesystem Version: 3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cross compilation toolchain filesystem layout (%{cross_triplet}) Group: Development/System @@ -84,6 +84,9 @@ mkdir %{buildroot}%{cross_sysroot}/var/db %changelog +* Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 3-6 +- Replace define with global + * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 3-5 - Rebuilt for Fedora 27 and 28 diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec index 3975268..edbee6d 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec @@ -1,28 +1,28 @@ -%define cross_arch arm -%define cross_triplet arm-linux-gnueabi -%define cross_sysroot %{_prefix}/%{cross_triplet}/sys-root +%global cross_arch arm +%global cross_triplet arm-linux-gnueabi +%global cross_sysroot %{_prefix}/%{cross_triplet}/sys-root %if 0%{?_unique_build_ids} -%define _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}" +%global _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}" %endif %if 0%{!?cross_stage:1} -%define cross_stage final +%global cross_stage final %endif %if %{cross_stage} != "final" -%define pkg_suffix -%{cross_stage} +%global pkg_suffix -%{cross_stage} %else -%define pkg_suffix %{nil} +%global pkg_suffix %{nil} %endif %if %{cross_arch} == "arm" - %define lib_dir_name lib + %global lib_dir_name lib %else %if %{cross_arch} == "arm64" - %define lib_dir_name lib64 + %global lib_dir_name lib64 %else - %define lib_dir_name lib + %global lib_dir_name lib %endif %endif @@ -30,10 +30,10 @@ Name: %{cross_triplet}-gcc%{pkg_suffix} Version: 7.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The GNU Compiler Collection (%{cross_triplet}) -%define major_version %(echo %{version} | sed 's/\\..*$//') +%global major_version %(echo %{version} | sed 's/\\..*$//') Group: Development/Languages License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -194,7 +194,7 @@ rm -f %{buildroot}%{_libexecdir}/gcc/%{cross_triplet}/%{major_version}/install-t rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet}/%{major_version}/install-tools # Don't strip libgcc.a and libgcov.a - based on Fedora Project cross-gcc.spec -%define __ar_no_strip $RPM_BUILD_DIR/gcc-%{version}/ar-no-strip +%global __ar_no_strip $RPM_BUILD_DIR/gcc-%{version}/ar-no-strip cat > %{__ar_no_strip} << EOF #!/bin/sh f=\$2 @@ -208,7 +208,7 @@ esac EOF chmod +x %{__ar_no_strip} %undefine __strip -%define __strip %{__ar_no_strip} +%global __strip %{__ar_no_strip} %files @@ -355,6 +355,9 @@ chmod +x %{__ar_no_strip} %changelog +* Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 7.2.0-4 +- Replace define with global + * Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 7.2.0-3 - Fix build ID conflict for Fedora 27 and later diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec index eed7e9f..e095a8d 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec @@ -1,54 +1,54 @@ -%define cross_arch arm -%define cross_triplet arm-linux-gnueabi -%define cross_sysroot %{_prefix}/%{cross_triplet}/sys-root +%global cross_arch arm +%global cross_triplet arm-linux-gnueabi +%global cross_sysroot %{_prefix}/%{cross_triplet}/sys-root %if 0%{?_unique_build_ids} -%define _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}" +%global _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}" %endif %if 0%{?bootstrap:1} -%define headers_only 1 -%define pkg_suffix -headers -%define debug_package %{nil} +%global headers_only 1 +%global pkg_suffix -headers +%global debug_package %{nil} %else -%define headers_only 0 -%define pkg_suffix %{nil} +%global headers_only 0 +%global pkg_suffix %{nil} %endif %if %{cross_arch} == "arm" - %define arm_type %(echo %{cross_triplet} | sed 's/.*-\\([a-z]*\\)$/\\1/') + %global arm_type %(echo %{cross_triplet} | sed 's/.*-\\([a-z]*\\)$/\\1/') %if %{arm_type} == "gnueabi" - %define loader_suffix %{nil} - %define loader_version 3 - %define gnu_hdr_suffix -soft - %define lib_dir_name lib + %global loader_suffix %{nil} + %global loader_version 3 + %global gnu_hdr_suffix -soft + %global lib_dir_name lib %else %if %{arm_type} == "gnueabihf" - %define loader_suffix -armhf - %define loader_version 3 - %define gnu_hdr_suffix -hard - %define lib_dir_name lib + %global loader_suffix -armhf + %global loader_version 3 + %global gnu_hdr_suffix -hard + %global lib_dir_name lib %else %{error:Unsupported ARM processor type} %endif %endif %else %if %{cross_arch} == "arm64" - %define loader_suffix -aarch64 - %define loader_version 1 - %define gnu_hdr_suffix -lp64 - %define lib_dir_name lib64 + %global loader_suffix -aarch64 + %global loader_version 1 + %global gnu_hdr_suffix -lp64 + %global lib_dir_name lib64 %else - %define loader_suffix %{nil} - %define loader_version 0 - %define gnu_hdr_suffix %{nil} - %define lib_dir_name lib + %global loader_suffix %{nil} + %global loader_version 0 + %global gnu_hdr_suffix %{nil} + %global lib_dir_name lib %endif %endif Name: %{cross_triplet}-glibc%{pkg_suffix} Version: 2.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The GNU C Library (%{cross_triplet}) Group: Development/Libraries @@ -134,7 +134,7 @@ rm -rf %{buildroot}%{cross_sysroot}/usr/share/locale %endif # Don't any static archive - based on Fedora Project cross-gcc.spec -%define __ar_no_strip $RPM_BUILD_DIR/glibc-%{version}/ar-no-strip +%global __ar_no_strip $RPM_BUILD_DIR/glibc-%{version}/ar-no-strip cat > %{__ar_no_strip} << EOF #!/bin/sh f=\$2 @@ -148,7 +148,7 @@ esac EOF chmod +x %{__ar_no_strip} %undefine __strip -%define __strip %{__ar_no_strip} +%global __strip %{__ar_no_strip} %files @@ -578,6 +578,9 @@ chmod +x %{__ar_no_strip} %changelog +* Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.26-5 +- Replace define with global + * Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.26-4 - Fix build ID conflict for Fedora 27 and later diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec index 043326f..ab79952 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec @@ -1,14 +1,14 @@ -%define cross_arch arm -%define cross_triplet arm-linux-gnueabi -%define cross_sysroot %{_prefix}/%{cross_triplet}/sys-root +%global cross_arch arm +%global cross_triplet arm-linux-gnueabi +%global cross_sysroot %{_prefix}/%{cross_triplet}/sys-root Name: %{cross_triplet}-kernel-headers Version: 4.14.5 Release: 1%{?dist} Summary: Header files for the Linux kernel (%{cross_triplet}) -%define debug_package %{nil} -%define kversion %(echo %{version} | sed 's/\\.0$//') +%global debug_package %{nil} +%global kversion %(echo %{version} | sed 's/\\.0$//') Group: Development/System License: GPLv2 @@ -127,6 +127,7 @@ find %{buildroot}%{cross_sysroot} -name ..install.cmd -delete * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 4.14.5-1 - Update to 4.14.5 - Use autosetup macro +- Replace define with global * Sat Dec 09 2017 Ting-Wei Lan <lantw44@gmail.com> - 4.14.4-1 - Update to 4.14.4 diff --git a/arm-linux-gnueabi-toolchain/create-arch.sh b/arm-linux-gnueabi-toolchain/create-arch.sh index 5e4de97..b378c7c 100755 --- a/arm-linux-gnueabi-toolchain/create-arch.sh +++ b/arm-linux-gnueabi-toolchain/create-arch.sh @@ -32,7 +32,7 @@ for boot_spec in bootstrap; do new_pkg_name="${new_triplet}-glibc-headers" echo "Creating bootstrap RPM spec: ${new_pkg_name}" mkdir -p "${new_dir}/${new_pkg_name}" - { echo '%define bootstrap 1'; + { echo '%global bootstrap 1'; cat "${new_dir}/${base_pkg_name}/${base_pkg_name}.spec"; } > \ "${new_dir}/${new_pkg_name}/${new_pkg_name}.spec" done @@ -42,7 +42,7 @@ for boot_spec in pass1 pass2; do new_pkg_name="${new_triplet}-gcc-${boot_spec}" echo "Creating bootstrap RPM spec: ${new_pkg_name}" mkdir -p "${new_dir}/${new_pkg_name}" - { echo "%define cross_stage ${boot_spec}"; + { echo "%global cross_stage ${boot_spec}"; cat "${new_dir}/${base_pkg_name}/${base_pkg_name}.spec"; } > \ "${new_dir}/${new_pkg_name}/${new_pkg_name}.spec" done diff --git a/guix/emacs-magit/emacs-magit.spec b/guix/emacs-magit/emacs-magit.spec index 51c965e..63b9e9c 100644 --- a/guix/emacs-magit/emacs-magit.spec +++ b/guix/emacs-magit/emacs-magit.spec @@ -1,14 +1,14 @@ -%define pkg magit -%define pkgname Magit +%global pkg magit +%global pkgname Magit %if %($(pkg-config emacs) ; echo $?) -%define emacs_version 22.1 -%define emacs_lispdir %{_datadir}/emacs/site-lisp -%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d +%global emacs_version 22.1 +%global emacs_lispdir %{_datadir}/emacs/site-lisp +%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d %else -%define emacs_version %(pkg-config emacs --modversion) -%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) -%define emacs_startdir %(pkg-config emacs --variable sitestartdir) +%global emacs_version %(pkg-config emacs --modversion) +%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) +%global emacs_startdir %(pkg-config emacs --variable sitestartdir) %endif Name: emacs-%{pkg} @@ -83,6 +83,7 @@ fi %changelog * Mon Dec 11 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.11.0-3 - Use autosetup macro +- Replace define with global * Sat Dec 09 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.11.0-2 - Use HTTPS in URL |