From 2dcadadf76cbb19b32888f6b56210988a2602456d09ae53922068b515d471eb3 Mon Sep 17 00:00:00 2001
From: Marius Kittler <marius.kittler@suse.com>
Date: Thu, 16 Nov 2017 13:19:11 +0000
Subject: [PATCH] Fix file conflicts

OBS-URL: https://build.opensuse.org/package/show/home:mkittler/c++utilities?expand=0&rev=26
---
 ...lities4.changes => libc++utilities.changes |  5 +++
 libc++utilities4.spec => libc++utilities.spec | 31 ++++++++++++-------
 2 files changed, 25 insertions(+), 11 deletions(-)
 rename libc++utilities4.changes => libc++utilities.changes (66%)
 rename libc++utilities4.spec => libc++utilities.spec (64%)

diff --git a/libc++utilities4.changes b/libc++utilities.changes
similarity index 66%
rename from libc++utilities4.changes
rename to libc++utilities.changes
index 882dc85..e9b51db 100644
--- a/libc++utilities4.changes
+++ b/libc++utilities.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 16 13:12:46 UTC 2017 - marius.kittler@suse.com
+
+- Fix file conflicts 
+
 -------------------------------------------------------------------
 Tue Nov  7 11:41:10 UTC 2017 - marius.kittler@suse.com
 
diff --git a/libc++utilities4.spec b/libc++utilities.spec
similarity index 64%
rename from libc++utilities4.spec
rename to libc++utilities.spec
index d6f1420..9c8d9e5 100644
--- a/libc++utilities4.spec
+++ b/libc++utilities.spec
@@ -1,11 +1,13 @@
 %define reponame c++utilities
-Name:           lib%{reponame}4
+%define soname 4
+
+Name:           lib%{reponame}
 Version:        4.11.0
 Release:        1
 License:        GPL-2.0+
 Summary:        Common C++ classes and routines
 Url:            https://github.com/Martchus/cpp-utilities
-Group:          System/Packages
+Group:          Development/Libraries/C and C++
 Source:         https://github.com/Martchus/cpp-utilities/archive/v%{version}/cpp-utilities-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
@@ -16,11 +18,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %description
 Common C++ classes and routines such as argument parser, IO and conversion utilities.
 
+%package -n lib%{reponame}%{soname}
+Summary:        Common C++ classes and routines
+Group:          System/Libraries
+
+%description -n lib%{reponame}%{soname}
+Common C++ classes and routines such as argument parser, IO and conversion utilities.
 
 %package devel
 Summary:        Devel files for %{reponame}
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       lib%{reponame}%{soname} = %{version}
 Requires:       glibc-devel
 Requires:       libstdc++-devel
 Requires:       cmake
@@ -35,12 +43,12 @@ Development files for %{reponame}
 %build
 mkdir -p build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-      -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+cmake -DCMAKE_INSTALL_PREFIX:STRING=%{_prefix} \
+      -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
       -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
       -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DLIB_SUFFIX_64="64" \
+      -DCMAKE_BUILD_TYPE:STRING=Release \
+      -DLIB_SUFFIX_64:STRING="64" \
       ..
 make %{?_smp_mflags}
 
@@ -52,18 +60,19 @@ make check %{?_smp_mflags}
 cd build
 make install DESTDIR=%{buildroot} %{?_smp_mflags}
 
-%post
+%post -n lib%{reponame}%{soname}
 ldconfig
 
-%postun
+%postun -n lib%{reponame}%{soname}
 ldconfig
 
-%files
+%files -n lib%{reponame}%{soname}
 %defattr(-,root,root)
-%{_libdir}/lib%{reponame}.so*
+%{_libdir}/lib%{reponame}.so.%{soname}*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{reponame}
 %{_datadir}/%{reponame}
 %{_libdir}/pkgconfig/%{reponame}.pc
+%{_libdir}/lib%{reponame}.so