[cxxtest] update to release 4.1
Martin Gieseking
mgieseki at fedoraproject.org
Wed Jan 23 16:46:03 UTC 2013
commit 6334e6364d2f19d22087f1b765e6e293279959c2
Author: Martin Gieseking <martin.gieseking at uos.de>
Date: Wed Jan 23 17:45:42 2013 +0100
update to release 4.1
.gitignore | 1 +
cxxtest-fix-abort.patch | 23 -------------
cxxtest-guide.patch | 21 ++++++++++++
cxxtest.spec | 82 ++++++++++++++++++++++++----------------------
sources | 3 +-
5 files changed, 66 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc1c3d6..52345aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
cxxtest-3.10.1.tar.gz
cxxtest-guide-3.10.1.pdf
+/cxxtest-4.1.tar.gz
diff --git a/cxxtest-guide.patch b/cxxtest-guide.patch
new file mode 100644
index 0000000..9e346ab
--- /dev/null
+++ b/cxxtest-guide.patch
@@ -0,0 +1,21 @@
+diff --git a/doc/Makefile b/doc/Makefile
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -7,7 +7,7 @@
+ A2X_OPTS := -a toc -a icons -L -d article -v --xsltproc-opts "$(XSLTPROC_OPTS)" --dblatex-opts "$(DBLATEX_OPTS)"
+
+ %.html: %.txt anchors outputs
+- asciidoc -v -b html -d article -n -a toc2 -a icons $<
++ asciidoc -v -b xhtml11 -d article -n -a toc2 -a icons $<
+
+ # Ignore errors (dblatex may not be installed)
+ %.pdf: %.txt anchors outputs
+diff --git a/doc/examples/cxxtestgen.out b/doc/examples/cxxtestgen.out
+--- a/doc/examples/cxxtestgen.out
++++ b/doc/examples/cxxtestgen.out
+@@ -43,4 +43,4 @@
+ --root Write the main() function and global data for a test
+ runner.
+ --part Write the tester classes for a test runner.
+- -f, --fog-parser Use new FOG C++ parser
++ -f, --fog-parser Use new FOG C++ parser (disabled)
diff --git a/cxxtest.spec b/cxxtest.spec
index 93358b3..9513bb2 100644
--- a/cxxtest.spec
+++ b/cxxtest.spec
@@ -1,80 +1,84 @@
Name: cxxtest
-Version: 3.10.1
-Release: 7%{?dist}
+Version: 4.1
+Release: 1%{?dist}
Summary: A JUnit-like testing framework for C++
Group: Development/Tools
License: LGPLv2+
-URL: http://cxxtest.tigris.org
-Source0: http://cxxtest.tigris.org/files/documents/6421/43281/%{name}-%{version}.tar.gz
+URL: http://cxxtest.com
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Documentation
-Source1: http://cxxtest.tigris.org/files/documents/6421/43284/%{name}-guide-%{version}.pdf
+# changes the asciidoc format selection from unknown specifier "html" to "xhtml11"
+Patch0: %{name}-guide.patch
-Patch0: %{name}-fix-abort.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python-devel
+BuildRequires: asciidoc
+BuildRequires: python2-devel
%description
-CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.
-Its advantages over existing alternatives are that it:
- - doesn't require RTTI
- - doesn't require member template functions
- - doesn't require exception handling
- - doesn't require any external libraries (including memory management,
- file/console I/O, graphics libraries)
+CxxTest is a unit testing framework for C++ that is similar in spirit to
+JUnit, CppUnit, and xUnit. CxxTest is easy to use because it does not require
+precompiling a CxxTest testing library, it employs no advanced features of
+C++ (e.g. RTTI) and it supports a very flexible form of test discovery.
%package doc
Summary: Documentation on how to use CxxTest
Group: Documentation
+Requires: %{name} = %{version}-%{release}
%description doc
This package contains the documentation on how to use CxxTest.
+It also provides code examples.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
-cp -a %{SOURCE1} .
+rm -f doc/images/icons/README
+#remove Windows-related stuff
+rm -rf sample/msvc/
+rm -f sample/Makefile.bcc32
-%build
+find . -name ".cvsignore" -delete
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/cxxtest
-install -D -p -m 644 cxxtest/* $RPM_BUILD_ROOT/%{_includedir}/cxxtest
-install -D -p -m 755 cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen.py
-ln -s %{_bindir}/cxxtestgen.py $RPM_BUILD_ROOT/%{_bindir}/cxxtestgen
+%build
+cd python
+CFLAGS="%{optflags}" %{__python} setup.py build
+cd ../doc
+make html
-%clean
-rm -rf $RPM_BUILD_ROOT
+%install
+mkdir -p %{buildroot}%{_includedir}/cxxtest
+install -D -p -m 644 cxxtest/* %{buildroot}%{_includedir}/cxxtest
+cd python
+%{__python} setup.py install --skip-build --root %{buildroot}
+cd ..
+install -D -p -m 644 doc/man/cxxtestgen.1 %{buildroot}%{_mandir}/man1/cxxtestgen.1
%files
-%defattr(-,root,root,-)
%doc COPYING README Versions
-%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
-%exclude %{_bindir}/*.pyc
-%exclude %{_bindir}/*.pyo
-%endif
-%{_bindir}/cxxtestgen.py
%{_bindir}/cxxtestgen
-%{_includedir}/cxxtest/
-
+%{_includedir}/%{name}/
+%{_mandir}/man1/cxxtestgen.1*
+%{python_sitelib}/%{name}/
+%{python_sitelib}/%{name}-*.egg-info
-%files doc
-%defattr(-,root,root,-)
-%doc cxxtest-guide-3.10.1.pdf
+%files doc
+%doc doc/guide.html doc/images/
+%doc sample/
%changelog
+* Wed Jan 23 2013 Martin Gieseking <martin.gieseking at uos.de> 4.1-1
+- updated to release 4.1
+- removed old EPEL stuff
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index ef728bf..bd61252 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ec7d089b6b5d67048e7db84c3231a35c cxxtest-3.10.1.tar.gz
-d2b0f683457ef266a316d47fc97115b1 cxxtest-guide-3.10.1.pdf
+c2abc2c9e9a2e83d776034389fc369cc cxxtest-4.1.tar.gz
More information about the scm-commits
mailing list