Accepting request 145686 from home:scarabeus_iv

- Version bump to 1.13.1
  * remove unused patches that are incorporated in the build system
  * cleanup the spec file at least a bit

OBS-URL: https://build.opensuse.org/request/show/145686
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cppunit?expand=0&rev=3
This commit is contained in:
2012-12-18 10:18:23 +00:00
committed by Git OBS Bridge
parent 219af43e12
commit 28b445b648
6 changed files with 25 additions and 67 deletions

View File

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

3
cppunit-1.13.1.tar.gz Normal file
View File

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

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Dec 17 18:08:56 UTC 2012 - tchvatal@suse.com
- Version bump to 1.13.1
* remove unused patches that are incorporated in the build system
* cleanup the spec file at least a bit
-------------------------------------------------------------------
Fri Nov 23 17:16:53 UTC 2012 - joop.boonen@opensuse.org

View File

@@ -1,32 +0,0 @@
--- doc/Makefile.am
+++ doc/Makefile.am 2007/07/04 13:59:13
@@ -13,7 +13,6 @@
# However, the manpages do not appear to be tremendously useful, so
# let's not bother.
-if DOC
htmldir = $(pkgdatadir)/html
html_DATA = $(static_pages) html/index.html
@@ -28,21 +27,6 @@
dox: html/index.html
-else
-
-# We repeat the three targets in both the "if" and "else" clauses
-# of the conditional, because the generated makefile will contain
-# references to the targets (target "install" depends on target
-# "install-datahook", for example), and some make programs get upset
-# if no target exists.
-
-install-data-hook:
-uninstall-local:
-dox:
-
-endif
-
-
all-local: dox

View File

@@ -16,20 +16,16 @@
#
%define soname 1_12-1
%define libname libcppunit-1_13-0
Name: cppunit
Version: 1.12.1
Release: 0.0
Version: 1.13.1
Release: 0
Summary: C++ Port of the JUnit Testing Framework
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Url: http://sourceforge.net/projects/cppunit/
Source: cppunit-%{version}.tar.bz2
Url: http://www.freedesktop.org/wiki/Software/cppunit
Source: http://dev-www.libreoffice.org/src/%name-%version.tar.gz
Source1: cppunit-devel.desktop
# PATCH-FIX-OPENSUSE cppunit.diff
Patch0: cppunit.diff
# PATCH-FIX-OPENSUSE cppunit_libdl.diff
Patch1: cppunit_libdl.diff
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: libtool
@@ -42,28 +38,25 @@ CppUnit is the C++ port of the famous JUnit framework for unit testing.
Test output is in XML for automatic testing and GUI based for
supervised tests.
%package -n libcppunit-%{soname}
%package -n %{libname}
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
%description -n libcppunit-%{soname}
%description -n %{libname}
This package contains all necessary include files and libraries needed
to develop applications that require these.
%package -n cppunit-devel
%package devel
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: libcppunit-%{soname} = %{version}
Requires: %{libname} = %{version}
%description -n cppunit-devel
%description devel
This package contains all necessary include files and libraries needed
to develop applications that require these.
%prep
%setup -q -n cppunit-%{version}
%patch0
%patch1 -p1
autoreconf -fi
%setup -q
%build
export CXXFLAGS="%{optflags}"
@@ -80,17 +73,17 @@ mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
install %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/
%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/cppunit-devel.desktop
%post -n libcppunit-%{soname} -p /sbin/ldconfig
%post -n %{libname} -p /sbin/ldconfig
%postun -n libcppunit-%{soname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%files -n libcppunit-%{soname}
%files -n %{libname}
%defattr(-,root,root)
%doc AUTHORS COPYING
%{_libdir}/libcppunit*.so.*
%{_datadir}/cppunit
%files -n cppunit-devel
%files devel
%defattr(-,root,root,755)
%doc NEWS README THANKS ChangeLog
%{_bindir}/DllPlugInTester

View File

@@ -1,10 +0,0 @@
--- cppunit-1.12.0.orig/src/cppunit/Makefile.am
+++ cppunit-1.12.0/src/cppunit/Makefile.am
@@ -63,5 +63,6 @@
libcppunit_la_LDFLAGS= \
-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE)
+ -release $(LT_RELEASE) \
+ @LIBADD_DL@