From 89331f9920e0544a62824e038a1db3aa94246dcd90bc3efa77eb76be9957f7f7 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 2 Jan 2023 14:40:45 +0000 Subject: [PATCH] remove braces from rpmspec macros OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=29 --- ocaml-calendar.spec | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 0b695aa..77c4d31 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -16,15 +16,15 @@ # -%define build_flavor @BUILD_FLAVOR@%{nil} -%if "%{build_flavor}" == "testsuite" +%define build_flavor @BUILD_FLAVOR@%nil +%if "%build_flavor" == "testsuite" %define nsuffix -testsuite %else -%define nsuffix %{nil} +%define nsuffix %nil %endif %define pkg ocaml-calendar -Name: %{pkg}%{nsuffix} +Name: %pkg%nsuffix Version: 2.04 Release: 0 %{?ocaml_preserve_bytecode} @@ -32,7 +32,7 @@ Summary: Objective Caml library for managing dates and times License: LGPL-2.0-only Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/calendar -Source0: %{pkg}-%{version}.tar.xz +Source0: %pkg-%version.tar.xz Patch0: ocaml-calendar.patch BuildRequires: ocaml BuildRequires: ocaml-dune @@ -42,7 +42,7 @@ BuildRequires: ocamlfind(re) BuildRequires: ocamlfind(unix) %endif -%if "%{build_flavor}" == "testsuite" +%if "%build_flavor" == "testsuite" BuildRequires: ocamlfind(calendar) %endif @@ -50,40 +50,40 @@ BuildRequires: ocamlfind(calendar) Objective Caml library for managing dates and times. %package devel -Summary: Development files for %{name} +Summary: Development files for %name Group: Development/Languages/OCaml -Requires: %{name} = %{version} +Requires: %name = %version %description devel -The %{name}-devel package contains libraries and signature files for -developing applications that use %{name}. +The %name-devel package contains libraries and signature files for +developing applications that use %name. %prep -%autosetup -p1 -n %{pkg}-%{version} +%autosetup -p1 -n %pkg-%version %build dune_release_pkgs='calendar' %ocaml_dune_setup -%if "%{build_flavor}" == "" +%if "%build_flavor" == "" %ocaml_dune_build %endif %install -%if "%{build_flavor}" == "" +%if "%build_flavor" == "" %ocaml_dune_install %ocaml_create_file_list %endif -%if "%{build_flavor}" == "testsuite" +%if "%build_flavor" == "testsuite" %check dune_test_tolerate_fail='dune_test_tolerate_fail' %ocaml_dune_test %endif -%if "%{build_flavor}" == "" -%files -f %{name}.files +%if "%build_flavor" == "" +%files -f %name.files -%files devel -f %{name}.files.devel +%files devel -f %name.files.devel %endif