[csmock] update to latest upstream (1.2.2)

[Kamil Dudka]

commit 0a99c820a30f447b39223a9a229becafc47a6f67
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Fri Jul 4 15:59:27 2014 +0200

    update to latest upstream (1.2.2)

 csmock.spec |   44 +++++++++++++++++++++-----------------------
 sources     |    2 +-
 2 files changed, 22 insertions(+), 24 deletions(-)
---
diff --git a/csmock.spec b/csmock.spec
index 78ab2e6..dbf89c5 100644
--- a/csmock.spec
+++ b/csmock.spec
@@ -1,5 +1,5 @@
 Name:       csmock
-Version:    1.1.1
+Version:    1.2.2
 Release:    1%{?dist}
 Summary:    A mock wrapper for Static Analysis tools
 
@@ -10,10 +10,20 @@ Source0:    https://git.fedorahosted.org/cgit/csmock.git/snapshot/csmock-%{versi
 
 BuildRequires: help2man
 BuildRequires: python
+%if !(0%{?fedora} >= 19 || 0%{?rhel} >= 7)
+BuildRequires: python-argparse
+%endif
 
+Requires: csdiff
+Requires: cswrap
+Requires: mock
+Requires: rpm-build
+
+# TODO: make these sub-packages optional
 Requires: csmock-plugin-clang
 Requires: csmock-plugin-cppcheck
-Requires: rpm-build
+
+Obsoletes: csmock-ng <= 1.1.1
 
 BuildArch: noarch
 
@@ -21,19 +31,9 @@ BuildArch: noarch
 This package contains cov-mockbuild and cov-diffbuild tools that allow to scan
 SRPMs by Static Analysis tools in a fully automated way.
 
-%package -n csmock-ng
-Summary: Preview of a new major version of the csmock package
-Requires: csdiff
-Requires: csmock
-Requires: cswrap
-Requires: mock
-
-%description -n csmock-ng
-Hihgly experimental, currently suitable only for development of csmock itself.
-
 %package -n csmock-plugin-clang
 Summary: csmock plug-in providing the support for Clang
-Requires: csmock-ng
+Requires: csmock
 
 %description -n csmock-plugin-clang
 Hihgly experimental, currently suitable only for development of csmock itself.
@@ -41,7 +41,7 @@ Hihgly 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
-Requires: csmock-ng
+Requires: csmock
 
 %description -n csmock-plugin-cppcheck
 Hihgly experimental, currently suitable only for development of csmock itself.
@@ -78,7 +78,6 @@ install -m0755 -d \
     "$RPM_BUILD_ROOT%{_bindir}" \
     "$RPM_BUILD_ROOT%{_mandir}/man1" \
     "$RPM_BUILD_ROOT%{_datadir}/csmock" \
-    "$RPM_BUILD_ROOT%{_datadir}/csmock/bashrc" \
     "$RPM_BUILD_ROOT%{_datadir}/csmock/scripts" \
     "$RPM_BUILD_ROOT%{python_sitearch}/" \
     "$RPM_BUILD_ROOT%{python_sitearch}/csmock" \
@@ -90,8 +89,6 @@ install -p -m0755 \
 
 install -p -m0644 man/{csmock,cov-{diff,mock}build}.1 "$RPM_BUILD_ROOT%{_mandir}/man1/"
 
-install -p -m0644 build.bashrc        "$RPM_BUILD_ROOT%{_datadir}/csmock/bashrc/build"
-install -p -m0644 prep.bashrc         "$RPM_BUILD_ROOT%{_datadir}/csmock/bashrc/prep"
 install -p -m0644 cov_checker_map.txt "$RPM_BUILD_ROOT%{_datadir}/csmock/cwe-map.csv"
 
 install -p -m0644 py/plugins/*.py \
@@ -104,17 +101,15 @@ install -p -m0755 scripts/*.sh \
 %{_bindir}/cov-dump-err
 %{_bindir}/cov-diffbuild
 %{_bindir}/cov-mockbuild
+%{_bindir}/csmock
 %{_bindir}/rpmbuild-rawbuild
 %{_mandir}/man1/cov-diffbuild.1*
 %{_mandir}/man1/cov-mockbuild.1*
-%{_datadir}/csmock
-%doc COPYING
-
-%files -n csmock-ng
-%{_bindir}/csmock
-%{_datadir}/csmock/scripts/patch-rawbuild.sh
 %{_mandir}/man1/csmock.1*
+%{_datadir}/csmock/cwe-map.csv
+%{_datadir}/csmock/scripts/patch-rawbuild.sh
 %{python_sitearch}/csmock/plugins/gcc.py*
+%doc COPYING
 
 %files -n csmock-plugin-clang
 %{_datadir}/csmock/scripts/fixups-clang.sh
@@ -124,6 +119,9 @@ install -p -m0755 scripts/*.sh \
 %{python_sitearch}/csmock/plugins/cppcheck.py*
 
 %changelog
+* Fri Jul 04 2014 Kamil Dudka <kdudka at redhat.com> 1.2.2-1
+- update to latest upstream
+
 * Thu Jun 19 2014 Kamil Dudka <kdudka at redhat.com> 1.1.1-1
 - update to latest upstream
 
diff --git a/sources b/sources
index e9ab9aa..19a8826 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f9fa30dd42a4666340dcc2d42089dcb  csmock-1.1.1.tar.xz
+217f6113dd6d5f457713a8db2e408897  csmock-1.2.2.tar.xz