[mingw-cxxtest: 5/10] Changes to spec based on rhbz https://bugzilla.redhat.com/show_bug.cgi?id=708473#c10

[epienbro]

commit 10cd67fbff548076f5521cdba69afdd53aa4fef9
Author: Adam Stokes <astokes at fedoraproject.org>
Date:   Thu Jul 21 10:50:13 2011 -0400

    Changes to spec based on rhbz https://bugzilla.redhat.com/show_bug.cgi?id=708473#c10
    
    Signed-off-by: Adam Stokes <astokes at fedoraproject.org>

 .gitignore           |    1 +
 mingw32-cxxtest.spec |   52 ++++++++-----------------------------------------
 sources              |    3 +-
 3 files changed, 11 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ae8577..9b941ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mingw32-cxxtest-3.10.1.tar.gz
 /mingw32-cxxtest-guide-3.10.1.pdf
+/cxxtest-3.10.1.tar.gz
diff --git a/mingw32-cxxtest.spec b/mingw32-cxxtest.spec
index d691007..52ce36e 100644
--- a/mingw32-cxxtest.spec
+++ b/mingw32-cxxtest.spec
@@ -1,25 +1,20 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-
 Name:           mingw32-cxxtest
 Version:        3.10.1
-Release:        4%{?dist}
+Release:        5%{?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
-
-# Documentation
-Source1:        http://cxxtest.tigris.org/files/documents/6421/43284/%{name}-guide-%{version}.pdf
+Source0:        http://cxxtest.tigris.org/files/documents/6421/43281/cxxtest-%{version}.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-devel
-BuildRequires:  mingw32-filesystem >= 57
-BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-filesystem
+Requires:       mingw32-filesystem
+
+# Remove the -doc subpackage as it duplicates what's in native cxxtest-doc
+Obsoletes:      mingw32-cxxtest-doc < 3.10.1-5
 
 %description
 CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.
@@ -31,51 +26,22 @@ Its advantages over existing alternatives are that it:
    file/console I/O, graphics libraries)
 
 
-%package doc
-Summary:        Documentation on how to use CxxTest
-Group:          Documentation
-
-%description doc
-This package contains the documentation on how to use CxxTest.
-
-
 %prep
-%setup -q -n %{name}
-cp -a %{SOURCE1} .
+%setup -q -n cxxtest
 
 %build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_mingw32_includedir}/cxxtest
 install -D -p -m 644 cxxtest/* $RPM_BUILD_ROOT/%{_mingw32_includedir}/cxxtest
-install -D -p -m 755 cxxtestgen.py $RPM_BUILD_ROOT/%{_mingw32_bindir}/cxxtestgen.py
-ln -s %{_mingw32_bindir}/cxxtestgen.py $RPM_BUILD_ROOT/%{_mingw32_bindir}/cxxtestgen
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING README Versions
-%if 0%{?fedora}<11 || 0%{?rhel} == 4 || 0%{?rhel} == 5
-%exclude %{_mingw32_bindir}/*.pyc
-%exclude %{_mingw32_bindir}/*.pyo
-%endif  
-%{_mingw32_bindir}/cxxtestgen.py
-%{_mingw32_bindir}/cxxtestgen
+%doc COPYING
 %{_mingw32_includedir}/cxxtest/
 
 
-
-%files doc 
-%defattr(-,root,root,-)
-%doc mingw32-cxxtest-guide-3.10.1.pdf
-
-
 %changelog
 * Wed Jun 22 2011 Adam Stokes <astokes at fedoraproject.org> - 3.10.1-4
 - Initial Build
diff --git a/sources b/sources
index 26b3d43..0b8927f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-da3c1f69d667730a52b79ac79c97d594  mingw32-cxxtest-3.10.1.tar.gz
-d2b0f683457ef266a316d47fc97115b1  mingw32-cxxtest-guide-3.10.1.pdf
+ec7d089b6b5d67048e7db84c3231a35c  cxxtest-3.10.1.tar.gz