changes 0.6.2

[platform/upstream/libsolv.git] / package / libsolv.spec.in

diff --git a/package/libsolv.spec.in b/package/libsolv.spec.in
index e96d153..e235f9c 100644 (file)
--- a/package/libsolv.spec.in
+++ b/package/libsolv.spec.in
@@ -99,6 +99,7 @@ Requires:       libsolv-tools = %version
 Requires:       libsolv@LIBSOLV_SOVERSION@ = %version
 %endif
 Requires:       rpm-devel
+Conflicts:      libsatsolver-devel
 
 %description devel
 Development files for libsolv, a new approach to package dependency solving
@@ -108,6 +109,7 @@ Summary:        A new approach to package dependency solving
 Group:          Development/Libraries/C and C++
 Obsoletes:      satsolver-tools < 0.18
 Provides:       satsolver-tools = 0.18
+Conflicts:      satsolver-tools-obsolete
 Requires:       gzip bzip2 coreutils findutils
 
 %description tools
@@ -123,6 +125,7 @@ Requires:       gnupg2
 %if 0%{?suse_version}
 Requires:       gpg2
 %endif
+Conflicts:      libsatsolver-demo
 
 %description demo
 Applications demoing the libsolv library.
@@ -164,7 +167,7 @@ CMAKE_FLAGS=
 CMAKE_FLAGS="-DFEDORA=1"
 %endif
 %if 0%{?suse_version}
-CMAKE_FLAGS="-DSUSE=1"
+CMAKE_FLAGS="-DSUSE=1 -DENABLE_APPDATA=1"
 %endif
 
 cmake   $CMAKE_FLAGS \
@@ -235,6 +238,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_bindir}/helix2solv
 %endif
 %{_datadir}/cmake/Modules/*
+%{_mandir}/man?/*
 
 %files demo
 %defattr(-,root,root)