From 4c9c3d8dee3c8b6e20f6c5374208d2b73e666b117106bff61080b78e044d0605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 8 Sep 2016 09:16:14 +0000
Subject: [PATCH] More renames

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=473
---
 baselibs.conf |  2 +-
 llvm.spec     | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index f027300..61b8de7 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,4 @@
 libLLVM3_8
 libclang3_8
 llvm-devel
-llvm-clang-devel
+clang-devel
diff --git a/llvm.spec b/llvm.spec
index a02c724..8d656bc 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -143,7 +143,7 @@ Requires:       oprofile-devel
 This package contains library and header files needed to develop
 new native programs that use the LLVM infrastructure.
 
-%package clang
+%package -n clang
 Summary:        CLANG frontend for LLVM
 Group:          Development/Languages/Other
 # Avoid multiple provider errors
@@ -156,11 +156,17 @@ Recommends:     scan-view
 %if %{with openmp}
 Recommends:     libomp
 %endif
+%if %{with libcxx}
+Recommends:     libc++
+Recommends:     libc++-devel
+%endif
+Provides:       llvm-clang = %{version}
+Obsoletes:      llvm-clang < %{version}
 
-%description clang
+%description -n clang
 This package contains the clang (C language) frontend for LLVM.
 
-%package clang-checker
+%package -n clang-checker
 Summary:        Static code analyzer for CLANG
 Group:          Development/Languages/Other
 # Avoid multiple provider errors
@@ -170,7 +176,7 @@ Conflicts:      otherproviders(scan-view)
 Provides:       scan-build
 Provides:       scan-view
 
-%description clang-checker
+%description -n clang-checker
 This package contains scan-build and scan-view, command line
 static code analyzers for CLANG.
 
@@ -184,14 +190,16 @@ Requires:       libstdc++-devel
 %description -n libclang%{_sonum}
 This package contains the shared libraries needed for clang.
 
-%package clang-devel
+%package -n clang-devel
 Summary:        CLANG frontend for LLVM (devel package)
 Group:          Development/Languages/Other
 Requires:       llvm-clang = %{version}
 Requires:       cmake(LLVM) = %{version}
 Conflicts:      otherproviders(cmake(Clang))
+Provides:       llvm-clang-devel = %{version}
+Obsoletes:      llvm-clang-devel < %{version}
 
-%description clang-devel
+%description -n clang-devel
 This package contains the clang (C language) frontend for LLVM.
 (development files)
 
@@ -551,8 +559,8 @@ ninja -v %{?_smp_mflags} check-libcxxabi
 %postun gold -p /sbin/ldconfig
 %post devel -p /sbin/ldconfig
 %postun devel -p /sbin/ldconfig
-%post clang-devel -p /sbin/ldconfig
-%postun clang-devel -p /sbin/ldconfig
+%post -n clang-devel -p /sbin/ldconfig
+%postun -n clang-devel -p /sbin/ldconfig
 %post LTO-devel -p /sbin/ldconfig
 %postun LTO-devel -p /sbin/ldconfig
 
@@ -593,7 +601,7 @@ ninja -v %{?_smp_mflags} check-libcxxabi
 %exclude %{_bindir}/llvm-config
 %exclude %{_mandir}/man1/llvm-config.1%{ext_man}
 
-%files clang
+%files -n clang
 %defattr(-,root,root)
 %{_bindir}/c-index-test
 %{_bindir}/c++-analyzer
@@ -608,7 +616,7 @@ ninja -v %{?_smp_mflags} check-libcxxabi
 %dir %{_libdir}/clang/
 %{_libdir}/clang/%{_relver}/
 
-%files clang-checker
+%files -n clang-checker
 %defattr(-,root,root)
 %{_bindir}/scan-build
 %{_bindir}/scan-view
@@ -674,7 +682,7 @@ ninja -v %{?_smp_mflags} check-libcxxabi
 %{_docdir}/llvm/
 %{_mandir}/man1/llvm-config.1%{ext_man}
 
-%files clang-devel
+%files -n clang-devel
 %defattr(-,root,root)
 %{_libdir}/libclang*.so
 %{_includedir}/clang/