From 9e2350137d5025ed0292d8543ea4a986f44cda881d90f2e63ad2ec3c058760b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 11 Dec 2015 12:44:14 +0000 Subject: [PATCH] Accepting request 348374 from home:pluskalm:branches:graphics - Cleanup spec file with spec-cleaner - Use url for source - Enable testsuite - Remove conditions which apply to unsuppoerted distributions - Drop no longer needed tclap-remove_Wextra.patch OBS-URL: https://build.opensuse.org/request/show/348374 OBS-URL: https://build.opensuse.org/package/show/graphics/tclap?expand=0&rev=3 --- tclap-1.2.1.tar.bz2 | 3 --- tclap-1.2.1.tar.gz | 3 +++ tclap-remove_Wextra.patch | 20 --------------- tclap.changes | 9 +++++++ tclap.spec | 54 +++++++-------------------------------- 5 files changed, 21 insertions(+), 68 deletions(-) delete mode 100644 tclap-1.2.1.tar.bz2 create mode 100644 tclap-1.2.1.tar.gz delete mode 100644 tclap-remove_Wextra.patch diff --git a/tclap-1.2.1.tar.bz2 b/tclap-1.2.1.tar.bz2 deleted file mode 100644 index 02e0f77..0000000 --- a/tclap-1.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9ccf082c1555160cab129f799162df060b92267ed2e4c412e495361e392c78a -size 298808 diff --git a/tclap-1.2.1.tar.gz b/tclap-1.2.1.tar.gz new file mode 100644 index 0000000..9fc8791 --- /dev/null +++ b/tclap-1.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f9f0fe3719e8a89d79b6ca30cf2d16620fba3db5b9610f9b51dd2cd033deebb +size 442387 diff --git a/tclap-remove_Wextra.patch b/tclap-remove_Wextra.patch deleted file mode 100644 index 61cfa0c..0000000 --- a/tclap-remove_Wextra.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- examples/Makefile.in.orig 2010-01-09 12:27:47.000000000 +0100 -+++ examples/Makefile.in 2010-01-09 12:27:52.000000000 +0100 -@@ -238,7 +238,7 @@ - test18_SOURCES = test18.cpp - test19_SOURCES = test19.cpp - AM_CPPFLAGS = -I$(top_srcdir)/include --@HAVE_GNU_COMPILERS_TRUE@AM_CXXFLAGS = -Wall -Wextra -+@HAVE_GNU_COMPILERS_TRUE@AM_CXXFLAGS = -Wall - all: all-am - - .SUFFIXES: ---- examples/Makefile.am.orig 2010-01-09 12:27:36.000000000 +0100 -+++ examples/Makefile.am 2010-01-09 12:27:41.000000000 +0100 -@@ -26,5 +26,5 @@ - AM_CPPFLAGS = -I$(top_srcdir)/include - - if HAVE_GNU_COMPILERS -- AM_CXXFLAGS = -Wall -Wextra -+ AM_CXXFLAGS = -Wall - endif diff --git a/tclap.changes b/tclap.changes index ffdca13..3885ea3 100644 --- a/tclap.changes +++ b/tclap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Dec 11 11:14:58 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Use url for source +- Enable testsuite +- Remove conditions which apply to unsuppoerted distributions +- Drop no longer needed tclap-remove_Wextra.patch + ------------------------------------------------------------------- Fri Oct 21 08:24:01 UTC 2011 - tony@daylessday.org diff --git a/tclap.spec b/tclap.spec index f62cbcd..f7d85f6 100644 --- a/tclap.spec +++ b/tclap.spec @@ -1,7 +1,7 @@ # # spec file for package tclap # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,45 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%if 0%{?suse_version} >= 1000 -%define with_doc 1 -%else -%define with_doc 0 -%endif Name: tclap Version: 1.2.1 Release: 0 -License: MIT Summary: Templatized C++ Command Line Parser -Url: http://tclap.sf.net +License: MIT Group: Development/Libraries/C and C++ -# http://prdownloads.sourceforge.net/tclap/tclap-%%{version}.tar.gz -Source: tclap-%{version}.tar.bz2 -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: tclap-remove_Wextra.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %with_doc -BuildRequires: autoconf -BuildRequires: automake +Url: http://tclap.sf.net +Source0: http://prdownloads.sourceforge.net/tclap/tclap-%{version}.tar.gz BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: glibc-devel BuildRequires: graphviz BuildRequires: libstdc++-devel -BuildRequires: libtool -BuildRequires: make -BuildRequires: pkgconfig +BuildRequires: pkg-config Provides: libtclap = %{version} Provides: libtclap-devel = %{version} -%endif #with_doc -%if 0%{?suse_version} >= 1030 -BuildRequires: fdupes -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description TCLAP is a small, flexible library that provides a simple interface for @@ -61,7 +43,6 @@ identical-except-for-type objects, such as IntArg, FloatArg, and StringArg. While the library is not strictly compliant with the GNU or POSIX standards, it is close. -%if %with_doc %package doc Summary: API Documentation for %{name} Group: Development/Libraries/C and C++ @@ -69,22 +50,13 @@ Group: Development/Libraries/C and C++ %description doc This package contains the API documentation for TCLAP, the Templatized C++ Command Line Parser. -%endif #with_doc %prep %setup -q -%if 0%{?suse_version} < 1000 -%patch1 -%endif %build %configure \ -%if %with_doc --enable-doxygen -%else - --disable-doxygen -%endif #with_doc - make %{?_smp_mflags} %install @@ -92,10 +64,8 @@ make %{?_smp_mflags} install -d "%{buildroot}%{_docdir}/%{name}" -%if %with_doc mv "%{buildroot}%{_datadir}/doc/tclap" "%{buildroot}%{_docdir}/%{name}/html" rm -rf "%{buildroot}%{_docdir}/%{name}/html/html/CVS" -%endif #with_doc echo -n > docfiles.lst for f in AUTHORS ChangeLog COPYING NEWS README; do @@ -103,14 +73,10 @@ for f in AUTHORS ChangeLog COPYING NEWS README; do echo "%doc %{_docdir}/%{name}/${f}" >> docfiles.lst done -%if %with_doc -%if 0%{?suse_version} >= 1030 %fdupes -s "%{buildroot}%{_docdir}/%{name}/html" -%endif -%endif #with_doc -%clean -rm -rf %{buildroot} +%check +make %{?_smp_mflags} check %files -f docfiles.lst %defattr(-,root,root) @@ -118,11 +84,9 @@ rm -rf %{buildroot} %{_includedir}/tclap %{_libdir}/pkgconfig/tclap.pc -%if %with_doc %files doc %defattr(-,root,root) %doc %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/html -%endif #with_doc %changelog