From f43364f4db84de5b9dc4c31511256f1106ec1033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= Date: Fri, 1 May 2020 15:43:51 +0300 Subject: Rename spec-helper.macros as macros.spec-helper --- Makefile | 4 ++-- NEWS | 1 + macros.spec-helper.in | 17 +++++++++++++++++ spec-helper.macros.in | 17 ----------------- 4 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 macros.spec-helper.in delete mode 100644 spec-helper.macros.in diff --git a/Makefile b/Makefile index edddac8..e2f5bc0 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ SCRIPT_FILES = check_desktop_files \ remove_info_dir \ restrict_to_cpu0 BIN_FILES = macroszification -MACROS_FILES = spec-helper.macros +MACROS_FILES = macros.spec-helper TEST_FILES = t/*.t FILES = Makefile NEWS README \ $(SCRIPT_FILES) $(BIN_FILES) $(MACROS_FILES:=.in) \ @@ -38,7 +38,7 @@ install: $(MACROS_FILES) install -d -m 755 $(DESTDIR)$(rpmmacrodir) install -p -m 644 $(MACROS_FILES) $(DESTDIR)$(rpmmacrodir) -spec-helper.macros: spec-helper.macros.in +macros.spec-helper: macros.spec-helper.in sed -e 's:@pkgdatadir@:$(pkgdatadir):' < $< > $@ clean: diff --git a/NEWS b/NEWS index 17d914a..86414fa 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,4 @@ + * rename spec-helper.macros as macros.spec-helper * remove unneeded translate_menu script (mga#26519) 2018-10-21 Jani Välimaa 0.31.22 diff --git a/macros.spec-helper.in b/macros.spec-helper.in new file mode 100644 index 0000000..bc3b947 --- /dev/null +++ b/macros.spec-helper.in @@ -0,0 +1,17 @@ +%_spec_helper_dir @pkgdatadir@ + +%__spec_helper_post \ + %{?!dont_clean_files: [ -n "$DONT_CLEANUP" ] || %_spec_helper_dir/clean_files} \ + %{?!dont_compress: [ -n "$DONT_COMPRESS" ] || %_spec_helper_dir/compress_files %{?_extension}%{?!_extension:.gz}} \ + %{?!dont_relink: [ -n "$DONT_RELINK" ] || %_spec_helper_dir/relink_symlinks} \ + %{?!dont_cleanup_perl: [ -n "$DONT_CLEAN_PERL" ] || %_spec_helper_dir/clean_perl} \ + %{?!dont_symlinks_libs: [ -n "$DONT_SYMLINK_LIBS" ] || %_spec_helper_dir/lib_symlinks} \ + %{?!dont_gprintify: [ -n "$DONT_GPRINTIFY" ] || %_spec_helper_dir/gprintify} \ + %{?!dont_fix_mo: [ -n "$DONT_FIX_MO" ] || %_spec_helper_dir/fix_mo} \ + %{?!dont_fix_pamd: [ -n "$DONT_FIX_PAMD_CONFIGS" ] || %_spec_helper_dir/fix_pamd} \ + %{?!dont_remove_info_dir: [ -n "$DONT_REMOVE_INFO_DIR" ] || %_spec_helper_dir/remove_info_dir} \ + %{?!dont_fix_eol: [ -n "$DONT_FIX_EOL" ] || %_spec_helper_dir/fix_eol} \ + %{?!dont_check_desktop_files: [ -n "$DONT_CHECK_DESKTOP_FILES" ] || %_spec_helper_dir/check_desktop_files} \ + %{?!dont_check_elf_files: [ -n "$DONT_CHECK_ELF_FILES" ] || %_spec_helper_dir/check_elf_files} \ +%nil + diff --git a/spec-helper.macros.in b/spec-helper.macros.in deleted file mode 100644 index bc3b947..0000000 --- a/spec-helper.macros.in +++ /dev/null @@ -1,17 +0,0 @@ -%_spec_helper_dir @pkgdatadir@ - -%__spec_helper_post \ - %{?!dont_clean_files: [ -n "$DONT_CLEANUP" ] || %_spec_helper_dir/clean_files} \ - %{?!dont_compress: [ -n "$DONT_COMPRESS" ] || %_spec_helper_dir/compress_files %{?_extension}%{?!_extension:.gz}} \ - %{?!dont_relink: [ -n "$DONT_RELINK" ] || %_spec_helper_dir/relink_symlinks} \ - %{?!dont_cleanup_perl: [ -n "$DONT_CLEAN_PERL" ] || %_spec_helper_dir/clean_perl} \ - %{?!dont_symlinks_libs: [ -n "$DONT_SYMLINK_LIBS" ] || %_spec_helper_dir/lib_symlinks} \ - %{?!dont_gprintify: [ -n "$DONT_GPRINTIFY" ] || %_spec_helper_dir/gprintify} \ - %{?!dont_fix_mo: [ -n "$DONT_FIX_MO" ] || %_spec_helper_dir/fix_mo} \ - %{?!dont_fix_pamd: [ -n "$DONT_FIX_PAMD_CONFIGS" ] || %_spec_helper_dir/fix_pamd} \ - %{?!dont_remove_info_dir: [ -n "$DONT_REMOVE_INFO_DIR" ] || %_spec_helper_dir/remove_info_dir} \ - %{?!dont_fix_eol: [ -n "$DONT_FIX_EOL" ] || %_spec_helper_dir/fix_eol} \ - %{?!dont_check_desktop_files: [ -n "$DONT_CHECK_DESKTOP_FILES" ] || %_spec_helper_dir/check_desktop_files} \ - %{?!dont_check_elf_files: [ -n "$DONT_CHECK_ELF_FILES" ] || %_spec_helper_dir/check_elf_files} \ -%nil - -- cgit v1.2.1