diff --git a/hamlib.spec b/hamlib.spec index 079dd04..6705a94 100644 --- a/hamlib.spec +++ b/hamlib.spec @@ -2,7 +2,7 @@ Name: hamlib Version: 1.2.15.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Run-time library to control radio transceivers and receivers Group: System Environment/Libraries @@ -12,8 +12,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. #Install python and perl bindings into proper dirs Patch0: hamlib-1.2.13-bindings.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: python-devel, swig, gd-devel, libxml2-devel, tcl-devel BuildRequires: libusb-devel, pkgconfig, boost-devel, libtool-ltdl-devel BuildRequires: doxygen @@ -36,7 +34,7 @@ command line interface or in a text-oriented interactive interface. %package devel Summary: Development library to control radio transceivers and receivers Group: Development/Libraries -Requires: hamlib = %{version}-%{release}, pkgconfig +Requires: hamlib%{?_isa} = %{version}-%{release} %description devel Hamlib radio control library C development headers and libraries @@ -45,7 +43,7 @@ for building C applications with Hamlib. %package doc Summary: Documentation for the hamlib radio control library Group: Documentation -Requires: hamlib = %{version}-%{release} +BuildArch: noarch %description doc This package provides the developers documentation for the hamlib radio @@ -54,7 +52,7 @@ control library API. %package c++ Summary: Hamlib radio control library C++ binding Group: Development/Libraries -Requires: hamlib = %{version}-%{release} +Requires: hamlib%{?_isa} = %{version}-%{release} %description c++ Hamlib radio control library C++ language binding. @@ -62,7 +60,8 @@ Hamlib radio control library C++ language binding. %package c++-devel Summary: Hamlib radio control library C++ binding development headers and libraries Group: Development/Libraries -Requires: hamlib-devel = %{version}-%{release}, hamlib-c++ = %{version}-%{release} +Requires: hamlib-devel%{?_isa} = %{version}-%{release} +Requires: hamlib-c++%{?_isa} = %{version}-%{release} %description c++-devel Hamlib radio control library C++ binding development headers and libraries @@ -72,7 +71,7 @@ for building C++ applications with Hamlib. %package perl Summary: Hamlib radio control library Perl binding Group: Development/Libraries -Requires: hamlib = %{version}-%{release} +Requires: hamlib%{?_isa} = %{version}-%{release} %description perl Hamlib PERL Language bindings to allow radio control from PERL scripts. @@ -80,7 +79,7 @@ Hamlib PERL Language bindings to allow radio control from PERL scripts. %package python Summary: Hamlib radio control library Python binding Group: Development/Libraries -Requires: hamlib = %{version}-%{release}, python +Requires: hamlib%{?_isa} = %{version}-%{release}, python %description python Hamlib Python Language bindings to allow radio control from Python scripts. @@ -88,7 +87,7 @@ Hamlib Python Language bindings to allow radio control from Python scripts. %package tcl Summary: Hamlib radio control library TCL binding Group: Development/Libraries -Requires: hamlib = %{version}-%{release} +Requires: hamlib%{?_isa} = %{version}-%{release} %description tcl Hamlib TCL Language bindings to allow radio control from TCL scripts. @@ -116,7 +115,6 @@ make make -C doc doc %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install #install documentation mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html/search @@ -126,6 +124,9 @@ done for f in `find doc/html/search -type f -maxdepth 1` do install -D -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/`echo $f | cut -d '/' -f3` done +# move installed docs to include them in subpackage via %%doc magic +rm -rf __tmp_doc ; mkdir __tmp_doc +mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/* __tmp_doc rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la @@ -142,8 +143,6 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name Hamlib.bs -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perltest.pl -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -159,16 +158,15 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-, root, root, - ) %doc AUTHORS ChangeLog PLAN COPYING.LIB COPYING README THANKS TODO %{_bindir}/* %{_sbindir}/* %{_libdir}/libhamlib.so.* +%dir %{_libdir}/hamlib %{_libdir}/hamlib/hamlib-*.so %{_mandir}/man?/* %files devel -%defattr(-, root, root, -) %doc README.developer %{_libdir}/libhamlib.so %{_datadir}/aclocal/hamlib.m4 @@ -181,39 +179,38 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/hamlib.pc %files doc -%defattr(-, root, root, -) -%doc %{_docdir}/%{name} +%doc COPYING.LIB +%doc __tmp_doc/* %files c++ -%defattr(-, root, root, -) -%doc COPYING.LIB %{_libdir}/libhamlib++.so.* %files c++-devel -%defattr(-, root, root, -) -%doc COPYING.LIB %{_libdir}/libhamlib++.so %{_includedir}/hamlib/rigclass.h %{_includedir}/hamlib/rotclass.h %files perl -%defattr(-, root, root, -) -%doc COPYING.LIB %{perl_vendorarch}/* %files python -%defattr(-, root, root, -) -%doc COPYING.LIB %{python_sitelib}/*.py* %{python_sitelib}/_Hamlib.so - %files tcl -%defattr(-, root, root) -%doc COPYING.LIB %{_libdir}/hamlibtcl* %changelog +* Sat Dec 14 2013 Michael Schwendt - 1.2.15.3-6 +- Fix duplicate documentation (#1001257) +- License included only in base package, subpackages that on base package + don't need to include it again +- Build noarch HTML -doc subpackage +- Include %%_libdir/hamlib directory +- Drop obsolete spec buildroot definition/removal and %%clean +- Add %%?_isa to explicit package deps +- Remove %%defattr + * Sat Aug 03 2013 Fedora Release Engineering - 1.2.15.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -325,7 +322,7 @@ rm -rf $RPM_BUILD_ROOT * Sat Nov 07 2009 Lucian Langa - 1.2.10-1 - new upstream release -* Wed Aug 23 2009 Lucian Langa - 1.2.9-1 +* Sun Aug 23 2009 Lucian Langa - 1.2.9-1 - new install rule for docs for new doxygen - misc cleanups - patch0 update @@ -452,7 +449,7 @@ rm -rf $RPM_BUILD_ROOT - Bump release to 1 - Fixed BuildRoot -* Mon Feb 10 2005 Ignacio Vazquez-Abrams 0:1.2.3-0.iva.1 +* Thu Feb 10 2005 Ignacio Vazquez-Abrams 0:1.2.3-0.iva.1 - Fixed error with automake in -devel (#26) * Mon Jan 31 2005 Ignacio Vazquez-Abrams 0:1.2.3-0.iva.0 @@ -474,7 +471,7 @@ rm -rf $RPM_BUILD_ROOT - Better use of rpm macros - Disable all bindings -* Tue Oct 08 2003 Joop Stakenborg +* Wed Oct 08 2003 Joop Stakenborg - Fix 'make rpm' again by disabling c++ bindings. - rotclass.h and rigclass.h go into the devel package for now (FIXME) @@ -482,11 +479,11 @@ rm -rf $RPM_BUILD_ROOT - Fix the spec file for 1.1.4CVS - 'make rpm' should work now -* Thu Jun 17 2002 Stephane Fillod +* Mon Jun 17 2002 Stephane Fillod - Added rotator support - Added RPC daemon, hamlib.m4 - Upstream version 1.1.3 -* Mon Jul 18 2001 Stephane Fillod +* Wed Jul 18 2001 Stephane Fillod - Made initial "working" SPEC file