diff --git a/tclap.spec b/tclap.spec index 52a6af6..59342d1 100644 --- a/tclap.spec +++ b/tclap.spec @@ -1,14 +1,15 @@ Name: tclap Summary: Template-Only Command Line Argument Parser Version: 1.2.0 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT URL: http://%{name}.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Group: System Environment/Libraries +Group: Development/Libraries BuildArch: noarch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Obsoletes: tclap-devel < 1.2.0-9 +Provides: tclap-devel = %{version}-%{release} %description %{name} is a small, flexible library that provides a simple interface for @@ -23,23 +24,9 @@ POSIX standards, it is close. standards-compliant C++ compiler. The library is implemented entirely in header files making it easy to use and distribute with other software. -It implies that this package is almost empty. The actual content, i.e., -the header files, are provided by the development package. - %{name} is now a mature, stable, and feature rich package. It probably will not see much further development aside from bug fixes and compatibility updates. -%package devel -Summary: Header files for the Template-Only Command Line Argument Parser -Group: Development/Libraries -Requires: %{name}%{?isa} = %{version}-%{release} -Requires: pkgconfig - -%description devel -Headers for the Template-Only Command Line Argument Parser. -Note: as that project has only headers (i.e., no library/binary object), -this package (i.e., the -devel package) is the one containing most of the -project. %package doc Summary: API Documentation for %{name} @@ -58,35 +45,36 @@ sed -i 's/\r//' docs/style.css %configure make %{?_smp_mflags} -%check -make %{?_smp_mflags} check - %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} # Move the pkgconfig helper file to the right location for Fedora # when the package is noarch mv -f %{buildroot}%{_libdir}/pkgconfig/ %{buildroot}%{_datadir}/ -%clean -rm -rf %{buildroot} +# move installed docs to include them in -devel package via %%doc magic +rm -rf __tmp_doc ; mkdir __tmp_doc +mv %{buildroot}%{_docdir}/%{name}/* __tmp_doc -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README +%check +make %{?_smp_mflags} check -%files devel -%defattr(-,root,root,-) +%files %{_includedir}/%{name}/ %{_datadir}/pkgconfig/%{name}.pc %doc AUTHORS COPYING README %files doc -%defattr(-,root,root,-) %doc AUTHORS COPYING README -%{_defaultdocdir}/%{name}/ +%doc __tmp_doc/* %changelog +* Fri Dec 13 2013 Michael Schwendt - 1.2.0-9 +- Fix duplicate documentation (#1001296) +- Fix the unusual packaging (eliminate dummy base package!) +- Remove %%_isa base package dep, since this is all noarch +- Remove explicit pkgconfig dep +- Remove %%defattr + * Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild