[csmock/epel7] update to latest upstream (1.2.3)

[Kamil Dudka]

commit eb256b385c3a9d8ad7079bfdc0055574cfc56bc7
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Thu Jun 19 18:00:10 2014 +0200

    update to latest upstream (1.2.3)

 csmock.spec |   39 ++++++++++++++++-----------------------
 sources     |    2 +-
 2 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/csmock.spec b/csmock.spec
index c685726..1aff3f9 100644
--- a/csmock.spec
+++ b/csmock.spec
@@ -1,5 +1,5 @@
 Name:       csmock
-Version:    1.0.11
+Version:    1.2.3
 Release:    1%{?dist}
 Summary:    A mock wrapper for Static Analysis tools
 
@@ -14,28 +14,26 @@ BuildRequires: python
 BuildRequires: python-argparse
 %endif
 
-Requires: cscppc
 Requires: csdiff
 Requires: cswrap
 Requires: mock
 Requires: rpm-build
 
+# TODO: make these sub-packages optional
+Requires: csmock-plugin-clang
+Requires: csmock-plugin-cppcheck
+
+Obsoletes: csmock-ng <= 1.1.1
+
 BuildArch: noarch
 
 %description
 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: csmock
-
-%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.
@@ -43,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.
@@ -53,9 +51,6 @@ Hihgly experimental, currently suitable only for development of csmock itself.
 %prep
 %setup -q
 
-# mock-unbuffered is no longer installed by csmock
-sed -i 's/mock-unbuffered/mock/' cov-mockbuild
-
 %build
 mkdir -p bin man
 
@@ -83,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" \
@@ -95,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 \
@@ -109,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
@@ -129,6 +119,9 @@ install -p -m0755 scripts/*.sh \
 %{python_sitearch}/csmock/plugins/cppcheck.py*
 
 %changelog
+* Thu Jul 17 2014 Kamil Dudka <kdudka at redhat.com> 1.2.3-1
+- update to latest upstream
+
 * Fri Jul 04 2014 Kamil Dudka <kdudka at redhat.com> 1.0.11-1
 - update to latest upstream bugfix release
 
diff --git a/sources b/sources
index 639510c..a990a2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a94efe9ddd524b17b8dda6e2b3a06e5f  csmock-1.0.11.tar.xz
+1176c8ea1a3325e5536b9d9231f5ea75  csmock-1.2.3.tar.xz