Accepting request 103467 from home:jengelh:branches:devel:libraries:c_c++

- Update to new upstream release 2.1.2
* modified dtd and xsl files to support inactive suites/tests
* Added ability to deactivate suite/tests dynamically
* Removed constraint that suite/test names be unique
- Remove redundant tags/sections
- Parallel build with %_smp_mflags
- Add autotools BuildRequires for factory/12.2
- Fix use of implicitly defined function in source
  (do not declare that post-build-checks's output was wrong)
- Add missing DT_NEEDED entry on ncurses

OBS-URL: https://build.opensuse.org/request/show/103467
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cunit?expand=0&rev=6

CUnit-2.1-0-src.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b98e5cefdad583f7cef7c43e93cae4a11a941dcd602790801a3f098519e3a83e
-size 420839

CUnit-2.1.2+svn139.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b24ebf9b37150f1c1056026d280b1e7bcc8cf6c20becf59370434ec1cdaa4014
+size 371046

cunit-2.1-pkgconfig.patch

@@ -1,46 +0,0 @@
-Index: CUnit-2.1-0/configure.in
-===================================================================
---- CUnit-2.1-0.orig/configure.in
-+++ CUnit-2.1-0/configure.in
-@@ -239,6 +239,7 @@ AC_CONFIG_FILES([Jamrules:Jamrules.in])
- 
- dnl Configure Makefile set.
- AC_CONFIG_FILES( Makefile \
-+		cunit.pc \
- 		CUnit.spec \
- 		CUnit/Makefile \
- 		CUnit/Headers/Makefile \
-Index: CUnit-2.1-0/cunit.pc.in
-===================================================================
---- /dev/null
-+++ CUnit-2.1-0/cunit.pc.in
-@@ -0,0 +1,9 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: CUnit
-+Description: CUnit is a unit testing framework for C
-+Version: @VERSION@
-+Libs: -L${libdir} -lcunit -lncurses
-Index: CUnit-2.1-0/Makefile.am
-===================================================================
---- CUnit-2.1-0.orig/Makefile.am
-+++ CUnit-2.1-0/Makefile.am
-@@ -10,6 +10,15 @@ COMPILE_DIRS += $(EXAMPLE_COMPILE_DIR)
- 
- SUBDIRS = ${COMPILE_DIRS}
- 
-+EXTRA_DIST = \
-+        cunit.pc.in \
-+        $(NULL)
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = \
-+        cunit.pc \
-+        $(NULL)
-+
- distdir=${PACKAGE}-${VERSION}-${RELEASE}
- 
- WD=`pwd`

cunit-link-ncurses.diff

@@ -0,0 +1,48 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: 2012-02-09 03:48:24.650731239 +0100
+
+cunit uses ncurses, therefore, link with ncurses. Otherwise building
+this can fail if e.g. -Wl,--no-undefined is used.
+
+And for -lncurses to trickle down into libcunit.la, libcunit.la must
+use the .la files as objects, not the .lo files.
+
+---
+ CUnit/Sources/Curses/Makefile.am |    1 +
+ CUnit/Sources/Makefile.am        |   15 +++++----------
+ 2 files changed, 6 insertions(+), 10 deletions(-)
+
+Index: cunit/CUnit/Sources/Curses/Makefile.am
+===================================================================
+--- cunit.orig/CUnit/Sources/Curses/Makefile.am
++++ cunit/CUnit/Sources/Curses/Makefile.am
+@@ -3,3 +3,4 @@
+ noinst_LTLIBRARIES = libcunitcurses.la
+ libcunitcurses_la_SOURCES = \
+ 	Curses.c
++libcunitcurses_la_LIBADD = -lncurses
+Index: cunit/CUnit/Sources/Makefile.am
+===================================================================
+--- cunit.orig/CUnit/Sources/Makefile.am
++++ cunit/CUnit/Sources/Makefile.am
+@@ -1,15 +1,10 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-BASIC_OBJECTS_SHARED = Basic/Basic.lo
+-AUTOMATED_OBJECTS_SHARED = Automated/Automated.lo
+-CONSOLE_OBJECTS_SHARED = Console/Console.lo
+-CURSES_OBJECTS_SHARED = Curses/Curses.lo
+-FRAMEWORK_OBJECTS_SHARED = \
+-	Framework/CUError.lo \
+-	Framework/MyMem.lo \
+-	Framework/TestDB.lo \
+-	Framework/TestRun.lo \
+-	Framework/Util.lo
++BASIC_OBJECTS_SHARED = Basic/libcunitbasic.la
++AUTOMATED_OBJECTS_SHARED = Automated/libcunitautomated.la
++CONSOLE_OBJECTS_SHARED = Console/libcunitconsole.la
++CURSES_OBJECTS_SHARED = Curses/libcunitcurses.la
++FRAMEWORK_OBJECTS_SHARED = Framework/libcunitfmk.la
+ 
+ FRAMEWORK_OBJECT_FILES_SHARED = $(FRAMEWORK_OBJECTS_SHARED)
+ FRAMEWORK_COMPILE_DIRS = Framework

cunit.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Feb  9 02:39:58 UTC 2012 - jengelh@medozas.de
+
+- Update to new upstream release 2.1.2
+* modified dtd and xsl files to support inactive suites/tests
+* Added ability to deactivate suite/tests dynamically
+* Removed constraint that suite/test names be unique
+- Remove redundant tags/sections
+- Parallel build with %_smp_mflags
+- Add autotools BuildRequires for factory/12.2
+- Fix use of implicitly defined function in source
+  (do not declare that post-build-checks's output was wrong)
+- Add missing DT_NEEDED entry on ncurses
+
 -------------------------------------------------------------------
 Tue Jun  8 18:12:46 UTC 2010 - andrea@opensuse.org
 

cunit.spec

@@ -3,25 +3,21 @@
 # package are under the same license as the package itself.
 #
 
-# norootforbuild
-
 Name:          cunit
-Version:       2.1
+Version:       2.1.2
 Release:       0
 Summary:       It provides C programmers a basic testing functionality
 Group:         Development/Libraries/C and C++
-License:       GPLv2
+License:       GPL-2.0
 Url:           http://cunit.sourceforge.net/
-BuildRequires: ncurses-devel pkg-config
+BuildRequires: autoconf, automake, libtool, ncurses-devel pkg-config
-Source:        CUnit-%{version}-0-src.tar.bz2
-Patch0:        %{name}-2.1-pkgconfig.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 
-# gcc error detected a false positive
+# The 2.1.2 tarball has a lot of files missing and is therefore quite broken.
-# Curses.c:425: warning: implicit declaration of function 'snprintf'
+# Pulled a new copy from svn.
-# E: CUnit implicit-fortify-decl Curses.c:425
+#Svn-Clone:	https://cunit.svn.sourceforge.net/svnroot/cunit/trunk
-# but file already #includes <stdio.h>
+Source:        CUnit-2.1.2+svn139.tar.bz2
-BuildRequires: -post-build-checks
+Patch1:		cunit-link-ncurses.diff
+BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 
 %description
 CUnit is a unit testing framework for C.
@@ -31,7 +27,6 @@ headers, and documentation files.
 
 %package devel
 Summary:       CUnit development files
-License:       GPLv2
 Group:         Development/Libraries/C and C++
 Requires:      ncurses-devel
 Requires:      libcunit1 = %{version}
@@ -44,7 +39,6 @@ This package installs the CUnit development files.
 
 %package devel-static
 Summary:       CUnit static development files
-License:       GPLv2
 Group:         Development/Libraries/C and C++
 Requires:      %{name}-devel = %{version}
 
@@ -54,7 +48,6 @@ This package installs the CUnit static files.
 
 %package doc
 Summary:       CUnit documentation
-License:       GPLv2
 Group:         Documentation/Man
 Requires:      libcunit1 = %{version}
 
@@ -65,17 +58,15 @@ documentation files.
 
 %package -n libcunit1
 Summary:       CUnit shared library
-License:       GPLv2
 Group:         Development/Libraries/C and C++
 
 %description  -n libcunit1
 CUnit is a unit testing framework for C.
-This package installs the CUnit shared library
+This package installs the CUnit shared library.
-YOU HAVE TO LINK TO -lncurses TOO OR BUILD WILL FAIL
 
 %prep
-%setup -q -n CUnit-%{version}-0
+%setup -qn cunit
-%patch0 -p1
+%patch -P 1 -p1
 chmod -x AUTHORS ChangeLog COPYING NEWS README TODO doc/*.html doc/*.css
 
 %build
@@ -87,7 +78,7 @@ autoreconf -fi
   --enable-curses \
   --enable-examples \
   --enable-test
-%__make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install
@@ -103,9 +94,6 @@ rm doc/headers/Jamfile*
 rm doc/Makefile*
 rm doc/Jamfile*
 
-%clean
-rm -rf %{buildroot}
-
 %post -n libcunit1 -p /sbin/ldconfig
 
 %postun -n libcunit1 -p /sbin/ldconfig