From a3d948c163aa8318cd7bf5836c22eb2f3ae32ab82a143ea4f612fe26578fccf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 28 Feb 2015 09:52:18 +0000 Subject: [PATCH] - Align the Conflict lines OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/speexdsp?expand=0&rev=2 --- speexdsp.changes | 5 +++++ speexdsp.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/speexdsp.changes b/speexdsp.changes index d8f3319..a312451 100644 --- a/speexdsp.changes +++ b/speexdsp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 28 09:51:56 UTC 2015 - tchvatal@suse.com + +- Align the Conflict lines + ------------------------------------------------------------------- Mon Feb 23 14:47:33 UTC 2015 - mpluskal@suse.com diff --git a/speexdsp.spec b/speexdsp.spec index 63ab020..cef14a3 100644 --- a/speexdsp.spec +++ b/speexdsp.spec @@ -28,7 +28,7 @@ Source: http://downloads.xiph.org/releases/speex/%{name}-%{package_versi Source2: baselibs.conf BuildRequires: pkg-config BuildRequires: pkgconfig(ogg) -Conflicts: speex <= 1.1.999_1.2rc1 +Conflicts: speex <= 1.1.999_1.2rc1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,7 +51,7 @@ to the Vorbis codec. Summary: Development package for SpeeX Group: Development/Libraries/C and C++ Requires: libspeexdsp1 = %{version} -Conflicts: speex-devel <= 1.1.999_1.2rc1 +Conflicts: speex-devel <= 1.1.999_1.2rc1 %description devel This package contains the files needed to compile programs that use the @@ -62,7 +62,7 @@ SpeeX library. %build %configure \ - --disable-static + --disable-static make %{?_smp_mflags}