[libkomparediff2] 4.14.3-2

[Rex Dieter]

commit 0ae1a97b3359579d3a058aa6957d1022cae11bb5
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Nov 20 13:54:25 2014 -0600

    4.14.3-2
    
    - help upgrade path for old kdesdk-kompare-libs
    - -devel: Requires: kdelibs4-devel (rather than cmake)
    - %files: track soname
    - minor cleanup, whitespace

 libkomparediff2.spec |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/libkomparediff2.spec b/libkomparediff2.spec
index 0cd6a45..42c1852 100644
--- a/libkomparediff2.spec
+++ b/libkomparediff2.spec
@@ -4,7 +4,7 @@
 Name:    libkomparediff2
 Summary: Library to compare files and strings
 Version: 4.14.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # Library: GPLv2+ (some files LGPLv2+), CMake scripts: BSD
 License: GPLv2+ and BSD
@@ -21,62 +21,75 @@ BuildRequires:  kdelibs4-devel >= %{version}
 
 Requires:       diffutils
 
+## upgrade paths, I *think* we can drop the conflicts now that good Obsoletes
+## are in place, but they shouldn't hurt to keep either.
 # Conflict with old Kompare builds which included libkomparediff2.
 Conflicts:      kompare < 4.11.80
 Conflicts:      kdesdk-kompare < 4.10.80
 
+Obsoletes: kompare-libs < 4.11.80
+Obsoletes: kdesdk-kompare-libs < 4.10.80
+
 %description
 A shared library to compare files and strings using kdelibs and GNU diff,
 used in Kompare and KDevelop.
 
 %package devel
 Summary: Developer files for %{name}
-Requires:  %{name}%{?_isa} = %{version}-%{release}
-
-# Directory ownership
-Requires:       cmake
-
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: kdelibs4-devel
 # Conflict with old Kompare builds which included libkomparediff2.
 Conflicts:      kompare-devel < 4.11.80
 # The library was unversioned in 4.10, so conflict with main Kompare package.
 Conflicts:      kdesdk-kompare < 4.10.80
-
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %prep
-%setup -q -n %{name}-%{version}
+%setup
+
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE4_BUILD_TESTS:BOOL=%{?tests}%{!?tests:0} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+
 %check
 %if 0%{?tests}
 make test/fast -C %{_target_platform}
 %endif
 
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %doc COPYING*
-%{_kde4_libdir}/libkomparediff2.so.*
+%{_kde4_libdir}/libkomparediff2.so.4*
 
 %files devel
 %{_kde4_includedir}/libkomparediff2/
 %{_kde4_libdir}/libkomparediff2.so
 %{_kde4_libdir}/cmake/libkomparediff2/
 
+
 %changelog
+* Thu Nov 20 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.14.3-2
+- help upgrade path for old kdesdk-kompare-libs
+- -devel: Requires: kdelibs4-devel (rather than cmake)
+- %files: track soname
+- minor cleanup, whitespace
+
 * Sat Nov 08 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.14.3-1
 - 4.14.3