From ff4631ec97a6cfda753c3682a5e4ec82a61b0440cd431c531a37a2a621fb3d94 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 27 Apr 2023 16:05:08 +0000 Subject: [PATCH] Accepting request 1083095 from home:jengelh:branches:multimedia:apps - Drop unused BuildRequire on xorg-x11-devel - Modernize specfile constructs OBS-URL: https://build.opensuse.org/request/show/1083095 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=56 --- csound.changes | 6 ++++++ csound.spec | 10 +++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/csound.changes b/csound.changes index 20b6564..3b9c89b 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 26 19:27:59 UTC 2023 - Jan Engelhardt + +- Drop unused BuildRequire on xorg-x11-devel +- Modernize specfile constructs + ------------------------------------------------------------------- Wed Dec 14 01:02:31 UTC 2022 - Konstantin Voinov diff --git a/csound.spec b/csound.spec index 8959b7f..1d4b860 100644 --- a/csound.spec +++ b/csound.spec @@ -1,7 +1,7 @@ # # spec file for package csound # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -75,10 +75,8 @@ BuildRequires: python3-devel BuildRequires: fltk-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: xorg-x11-devel %endif Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/') @@ -151,8 +149,7 @@ Development files for Csound, a sound synthesis program. %lang_package %prep -%setup -q -%autopatch -p1 +%autosetup -p1 # remove __DATE__ from source files, causes unnecessary rebuilds #sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme @@ -180,7 +177,7 @@ export CXXFLAGS="%{optflags} -std=c++11" -DUSE_LIB64:BOOL=OFF %endif -make %{_smp_mflags} +%make_build %install %cmake_install @@ -236,6 +233,5 @@ cp -v OOps/README.md README.OOps %{_datadir}/cmake/Csound/ %files lang -f %{name}%{maj}.lang -%defattr(-,root,root) %changelog