Skip to content

Commit

Permalink
Merge pull request #4383 from cms-sw/cppunit-1.40.1
Browse files Browse the repository at this point in the history
updated cppunit to version 1.40.1
  • Loading branch information
smuzaffar committed Sep 27, 2018
2 parents e9e47f1 + 79c1afb commit 1b9bc17
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 71 deletions.
47 changes: 0 additions & 47 deletions CppUnit_testdriver_cpp.file

This file was deleted.

29 changes: 5 additions & 24 deletions cppunit.spec
@@ -1,35 +1,18 @@
### RPM external cppunit 1.12.1
Source0: http://switch.dl.sourceforge.net/sourceforge/%n/%n-%realversion.tar.gz
Source1: CppUnit_testdriver_cpp
### RPM external cppunit 1.40.1
Source: git://anongit.freedesktop.org/git/libreoffice/%{n}.git?=master/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
BuildRequires: gmake autotools

%prep
%setup -n %n-%realversion

%build
case %cmsplatf in
osx* ) perl -p -i -e 's|rm(.*)conftest|rm -fr $1 conftest|g' configure \
aclocal.m4 \
libtool \
config/ltmain.sh
;;
slc*|fc* )
# Ugly hack to force -ldl to be linked, which for some reason is
# not currently happening via configure
perl -p -i -e 's|LIBS.*LIBS.*lm|LIBS="$LIBS -lm -ldl|' configure
;;
esac

# Update to detect aarch64 and ppc64le
rm -f ./config/config.{sub,guess}
curl -L -k -s -o ./config/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
curl -L -k -s -o ./config/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
chmod +x ./config/config.{sub,guess}

./autogen.sh
./configure --prefix=%i --disable-static
make %makeprocesses

%install
make install
cp %_sourcedir/CppUnit_testdriver_cpp %i/include/CppUnit_testdriver.cpp
# We remove pkg-config files for two reasons:
# * it's actually not required (macosx does not even have it).
# * rpm 4.8 adds a dependency on the system /usr/bin/pkg-config
Expand All @@ -43,5 +26,3 @@ rm -rf %i/lib/*.{l,}a
# Read documentation online
%define drop_files %i/share

%post
%{relocateConfig}/bin/cppunit-config

0 comments on commit 1b9bc17

Please sign in to comment.