From 980aaf5b0e7658ab6043a7666e6147be6ef18bb0 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Sep 03 2014 12:05:00 +0000
Subject: update to latest upstream (1.4.0)


---

diff --git a/csmock.spec b/csmock.spec
index d3016b5..c1d3cfa 100644
--- a/csmock.spec
+++ b/csmock.spec
@@ -1,5 +1,5 @@
 Name:       csmock
-Version:    1.3.2
+Version:    1.4.0
 Release:    1%{?dist}
 Summary:    A mock wrapper for Static Analysis tools
 
@@ -14,42 +14,38 @@ BuildRequires: python-devel
 BuildRequires: python-argparse
 %endif
 
-Requires: csdiff
-Requires: cswrap >= 1.0.4
-Requires: mock
-Requires: rpm-build
-
-# TODO: make these sub-packages optional
+Requires: csmock-common
 Requires: csmock-plugin-clang
 Requires: csmock-plugin-cppcheck
 
-Obsoletes: csmock-ng <= 1.1.1
-
 BuildArch: noarch
 
 %description
+This is a metapackage pulling in csmock-common and basic csmock plug-ins.
+
+%package -n csmock-common
+Summary: Core of csmock (a mock wrapper for Static Analysis tools)
+Requires: csdiff
+Requires: cswrap >= 1.0.4
+Requires: mock
+Requires: rpm-build
+
+%description -n csmock-common
 This package contains the csmock tool that allows to scan SRPMs by Static
 Analysis tools in a fully automated way.
 
 %package -n csmock-plugin-clang
 Summary: csmock plug-in providing the support for Clang
-Requires: csmock
+Requires: csclng
+Requires: csmock-common
 
 %description -n csmock-plugin-clang
 This package contains the clang plug-in for csmock.
 
-%package -n csmock-plugin-clang-fast
-Summary: csmock plug-in providing the support for Clang via the csclng wrapper
-Requires: csclng
-Requires: csmock
-
-%description -n csmock-plugin-clang-fast
-Highly experimental, currently suitable only for development of csmock itself.
-
 %package -n csmock-plugin-cppcheck
 Summary: csmock plug-in providing the support for Cppcheck
 Requires: cscppc >= 1.0.4
-Requires: csmock
+Requires: csmock-common
 
 %description -n csmock-plugin-cppcheck
 This package contains the cppcheck plug-in for csmock.
@@ -73,11 +69,11 @@ sed -e 's/@VERSION@/%{name}-%{version}-%{release}/' \
     -i py/csmock
 
 help2man --no-info --section 1 --name \
-    "run static analysis of the given SRPM using mock" \
+    "DEPRECATED - please use csmock instead!" \
     bin/cov-mockbuild > man/cov-mockbuild.1
 
 help2man --no-info --section 1 --name \
-    "run static analysis of the given the patches in the given SRPM using cov-mockbuild" \
+    "DEPRECATED - please use 'csmock --diff-patches' instead!" \
     bin/cov-diffbuild > man/cov-diffbuild.1
 
 help2man --no-info --section 1 --name \
@@ -95,7 +91,7 @@ install -m0755 -d \
     "$RPM_BUILD_ROOT%{python2_sitelib}/csmock/plugins"
 
 install -p -m0755 \
-    cov-{diff,mock}build cov-dump-err rpmbuild-rawbuild py/csmock \
+    cov-{diff,mock}build rpmbuild-rawbuild py/csmock \
     "$RPM_BUILD_ROOT%{_bindir}"
 
 install -p -m0644 man/{csmock,cov-{diff,mock}build}.1 "$RPM_BUILD_ROOT%{_mandir}/man1/"
@@ -108,8 +104,10 @@ install -p -m0644 py/plugins/*.py \
 install -p -m0755 scripts/*.sh \
     "$RPM_BUILD_ROOT%{_datadir}/csmock/scripts"
 
+# needed to create the csmock RPM
 %files
-%{_bindir}/cov-dump-err
+
+%files -n csmock-common
 %{_bindir}/cov-diffbuild
 %{_bindir}/cov-mockbuild
 %{_bindir}/csmock
@@ -123,16 +121,15 @@ install -p -m0755 scripts/*.sh \
 %doc COPYING
 
 %files -n csmock-plugin-clang
-%{_datadir}/csmock/scripts/fixups-clang.sh
 %{python2_sitelib}/csmock/plugins/clang.py*
 
-%files -n csmock-plugin-clang-fast
-%{python2_sitelib}/csmock/plugins/clang-fast.py*
-
 %files -n csmock-plugin-cppcheck
 %{python2_sitelib}/csmock/plugins/cppcheck.py*
 
 %changelog
+* Wed Sep 03 2014 Kamil Dudka <kdudka@redhat.com> 1.4.0-1
+- update to latest upstream
+
 * Wed Aug 20 2014 Kamil Dudka <kdudka@redhat.com> 1.3.2-1
 - update to latest upstream