[check/el4/master] Revert to 0.9.3-5 as per RHEL-5

Paul Howarth pghmcfc at fedoraproject.org
Sun Jan 2 22:34:00 UTC 2011


commit b6fefd5c58812971a9e3ec0fca7e7da557d07148
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Jan 2 22:33:23 2011 +0000

    Revert to 0.9.3-5 as per RHEL-5

 .gitignore             |    2 +-
 check-0.9.2-fPIC.patch |   11 +++++
 check.spec             |  117 ++++++++++-------------------------------------
 sources                |    2 +-
 4 files changed, 38 insertions(+), 94 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d515d5..6db4757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-check-0.9.8.tar.gz
+/check-0.9.3.tar.gz
diff --git a/check-0.9.2-fPIC.patch b/check-0.9.2-fPIC.patch
new file mode 100644
index 0000000..6ae1d1e
--- /dev/null
+++ b/check-0.9.2-fPIC.patch
@@ -0,0 +1,11 @@
+--- check-0.9.2/configure.BAD	2005-08-14 16:01:27.000000000 -0500
++++ check-0.9.2/configure	2005-08-14 16:01:41.000000000 -0500
+@@ -1181,7 +1181,7 @@
+ fi
+ 
+ if test -n "$GCC"; then
+-   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings"
++   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -fPIC"
+ fi
+ # Extract the first word of "docbook2html", so it can be a program name with args.
+ set dummy docbook2html; ac_word=$2
diff --git a/check.spec b/check.spec
index b4e0cda..05096d2 100644
--- a/check.spec
+++ b/check.spec
@@ -1,13 +1,14 @@
-Name:           check
-Version:        0.9.8
-Release:        2%{?dist}
-Summary:        A unit test framework for C
-Source0:        http://downloads.sourceforge.net/check/%{name}-%{version}.tar.gz
-Group:          Development/Tools
-License:        LGPLv2+
-URL:            http://check.sourceforge.net/
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+Name:		check
+Version:	0.9.3
+Release:	5%{?dist}
+Summary:	A unit test framework for C
+Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
+Group:		Development/Tools
+License:	LGPL
+URL:		http://check.sourceforge.net/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	docbook-utils
+Patch0:		check-0.9.2-fPIC.patch
 
 %description
 Check is a unit test framework for C. It features a simple interface for 
@@ -17,110 +18,42 @@ failures and code errors that cause segmentation faults or other signals.
 The output from unit tests can be used within source code editors and IDEs.
 
 %package devel
-Summary:        Libraries and headers for developing programs with check
-Group:          Development/Libraries
-Requires:       pkgconfig
-Requires:       %{name} = %{version}-%{release}
+Summary:	Libraries and headers for developing programs with check
+Group:		Development/Libraries
+Provides:	%{name} = %{version}-%{release}
 
 %description devel
-Libraries and headers for developing programs with check
-
-%package static
-Summary:        Static libraries of check
-Group:          Development/Libraries
-
-%description static
-Static libraries of check.
+Check is a unit test framework for C. It features a simple interface for
+defining unit tests, putting little in the way of the developer. Tests
+are run in a separate address space, so Check can catch both assertion
+failures and code errors that cause segmentation faults or other signals.
+The output from unit tests can be used within source code editors and IDEs.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure CFLAGS="${RPM_OPT_FLAGS} -fPIC"
+# check prefers to be static linked, do not remove
+%configure
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
-rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-if [ -e %{_infodir}/%{name}.info* ]; then
-  /sbin/install-info \
-    --entry='* Check: (check).               A unit testing framework for C.' \
-    %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
-
-%postun -p /sbin/ldconfig
-
-%preun
-if [ $1 = 0 -a -e %{_infodir}/%{name}.info* ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING.LESSER ChangeLog ChangeLogOld NEWS README SVNChangeLog
-%doc THANKS TODO
-%{_libdir}/libcheck.so.*
-%{_infodir}/check*
-
 %files devel
 %defattr(-,root,root,-)
-%doc doc/example
 %{_includedir}/check.h
-%{_libdir}/libcheck.so
-%{_libdir}/pkgconfig/check.pc
-%{_datadir}/aclocal/check.m4
-
-#check used to be static only, hence this.
-%files static
-%defattr(-,root,root,-)
-%doc COPYING.LESSER
+# check prefers to be static linked, do not remove
 %{_libdir}/libcheck.a
+%{_datadir}/doc/%{name}-%{version}
+%{_datadir}/aclocal/check.m4
 
 %changelog
-* Mon Nov 29 2010 Jerry James <loganjerry at gmail.com> - 0.9.8-2
-- Add license file to -static package.
-- Remove BuildRoot tag.
-
-* Mon Sep 28 2009 Jerry James <loganjerry at gmail.com> - 0.9.8-1
-- Update to 0.9.8
-
-* Thu Aug  6 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-5
-- Support --excludedocs (bz 515933)
-- Replace broken upstream info dir entry
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Apr  7 2009 Jerry James <loganjerry at gmail.com> - 0.9.6-3
-- Add check-0.9.6-strdup.patch
-
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Jan  6 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.9.6-1
-- update to 0.9.6
-
-* Mon Dec  1 2008 Jerry James <loganjerry at gmail.com> - 0.9.5-3
-- Fix unowned directory (bz 473635)
-- Drop unnecessary BuildRequires
-- Replace patches with addition of -fPIC to CFLAGS in the spec file
-- Add some more documentation files
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.5-2.1
-- Autorebuild for GCC 4.3
-
-* Thu Aug  2 2007 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.5-1
-- 0.9.5 bump
-
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3-5
 - rebuild
 
diff --git a/sources b/sources
index b233f50..73c30f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d75e9a6027cde79d2c339ef261e7470  check-0.9.8.tar.gz
+6e5870f7c9c5414572158d8005e91d68  check-0.9.3.tar.gz


More information about the scm-commits mailing list