From f5a8b20de7274ea0e7af11d171ec7dabd0922c2f Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Aug 26 2016 04:38:56 +0000 Subject: clean up spec as per latest Fedora guidelines Now that we are using the latest Python macros the spec is not portable back to EPEL anyway, so we might as well clean out any EPELisms. --- diff --git a/lcm.spec b/lcm.spec index 38027e0..ecf39df 100644 --- a/lcm.spec +++ b/lcm.spec @@ -1,25 +1,12 @@ # vim: set ts=4 sw=4 et: coding=UTF-8 -%if 0%{?rhel} < 6 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - - Name: lcm Version: 1.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Summary: Utilities for lightweight communications and marshaling URL: https://lcm-proj.github.io/ -Group: Applications/Engineering Source: https://github.com/lcm-proj/lcm/releases/download/v%{version}/%{name}-%{version}.zip -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -# package fails to build on fedora epel for el5 and el6 due to missing -# java-devel build dependency; excluding arch -%if 0%{?rhel} <= 6 -ExcludeArch: ppc ppc64 -%endif BuildRequires: chrpath BuildRequires: glib2-devel @@ -36,10 +23,7 @@ specification language with bindings for applications in C, Java and Python. %package java Summary: Lightweight communications and marshaling java artifacts -Group: System Environment/Libraries -%if 0%{?rhel} >= 6 BuildArch: noarch -%endif BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils Requires: java >= 1:1.6.0 @@ -54,10 +38,7 @@ This package provides the java stuff... %package javadoc Summary: Lightweight communications and marshaling java artifacts documentation -Group: Documentation -%if 0%{?rhel} >= 6 BuildArch: noarch -%endif Requires: jpackage-utils %description javadoc @@ -69,7 +50,6 @@ This package provides the java documentation. %package -n python2-%{name} Summary: Lightweight communications and marshaling Python 2 bindings -Group: System Environment/Libraries %{?python_provide:%python_provide python2-%{name}} Provides: %{name}-python%{?_isa} = %{version}-%{release} Provides: %{name}-python = %{version}-%{release} @@ -83,7 +63,6 @@ systems where high-bandwidth and low latency are critical. %package -n python3-%{name} Summary: Lightweight communications and marshaling Python 3 bindings -Group: System Environment/Libraries %{?python_provide:%python_provide python3-%{name}} %description -n python3-%{name} @@ -93,15 +72,9 @@ systems where high-bandwidth and low latency are critical. %package devel Summary: Lightweight communications and marshaling development files -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-python%{?_isa} = %{version}-%{release} -%if 0%{?rhel} < 6 -Requires: pkgconfig -Requires: %{name}-java%{?_isa} = %{version}-%{release} -%else Requires: %{name}-java = %{version}-%{release} -%endif %description devel LCM is a library for message passing and data marshaling targeted at real time @@ -165,9 +138,6 @@ find %{buildroot}%{_bindir} -type f -name "lcm-logger" -print -exec chrpath --de find %{buildroot}%{python2_sitearch} -type f -name "_lcm.so" -print -exec chrpath --delete {} \; find %{buildroot}%{python3_sitearch} -type f -name "_lcm.so" -print -exec chrpath --delete {} \; -%clean -rm -rf %{buildroot} - %check make check V=1 @@ -178,8 +148,8 @@ make check V=1 %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING NEWS +%license COPYING +%doc AUTHORS NEWS %{_bindir}/lcm-gen %{_bindir}/lcm-logger %{_bindir}/lcm-logplayer @@ -191,7 +161,7 @@ make check V=1 %files java -%defattr(-,root,root,-) +%license COPYING %doc AUTHORS COPYING %{_bindir}/lcm-logplayer-gui %{_bindir}/lcm-spy @@ -201,22 +171,20 @@ make check V=1 %files javadoc -%defattr(-,root,root,-) +%license COPYING +%doc AUTHORS COPYING %{_javadocdir}/%{name}/ %files -n python2-%{name} -%defattr(-,root,root,-) %{python2_sitearch}/lcm/ %files -n python3-%{name} -%defattr(-,root,root,-) %{python3_sitearch}/lcm/ %files devel -%defattr(-,root,root,-) %{_includedir}/%{name}/ %{_libdir}/liblcm.so %{_libdir}/pkgconfig/lcm.pc @@ -225,6 +193,9 @@ make check V=1 %changelog +* Fri Aug 26 2016 Dan Callaghan - 1.3.1-3 +- clean up spec as per latest Fedora guidelines + * Wed Aug 24 2016 Tomas Orsava - 1.3.1-2 - Added support for Python 3 — new subpackage python3-lcm - The package is now being built two times, once with Python 2 bindings and