From: Jan Palus <atler@pld-linux.org>
Date: Tue, 22 May 2018 20:46:58 +0000 (+0200)
Subject: C: poppler-devel belongs to devel
X-Git-Tag: auto/th/poppler0.61-0.61.0-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=1fa14f6784d2ed98a54bf86a95636562960c92d2;p=packages%2Fpoppler0.61.git

C: poppler-devel belongs to devel
---

diff --git a/poppler0.61.spec b/poppler0.61.spec
index 25419b3..920c0b5 100644
--- a/poppler0.61.spec
+++ b/poppler0.61.spec
@@ -45,7 +45,6 @@ BuildRequires:	which
 BuildRequires:	xz
 BuildRequires:	zlib-devel
 Requires:	openjpeg2 >= 2
-Conflicts:	poppler-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,6 +70,7 @@ Requires:	curl-devel
 Requires:	lcms2-devel >= 2
 Requires:	libstdc++-devel >= 6:4.7
 Requires:	nss-devel >= 3
+Conflicts:	poppler-devel
 
 %description devel
 Header files for the Poppler library.