From aa5c150a77a769add0b56e4c4c7b49016d2f0c20 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 19 2019 09:29:13 +0000 Subject: Package python2-lcm was removed (#1629812) --- diff --git a/lcm.spec b/lcm.spec index 53fa791..b0d5127 100644 --- a/lcm.spec +++ b/lcm.spec @@ -2,7 +2,7 @@ Name: lcm Version: 1.3.1 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ Summary: Utilities for lightweight communications and marshaling URL: https://lcm-proj.github.io/ @@ -12,7 +12,6 @@ BuildRequires: gcc BuildRequires: chrpath BuildRequires: glib2-devel BuildRequires: gettext -BuildRequires: python2-devel BuildRequires: python3-devel %description @@ -49,18 +48,6 @@ systems where high-bandwidth and low latency are critical. This package provides the java documentation. -%package -n python2-%{name} -Summary: Lightweight communications and marshaling Python 2 bindings -%{?python_provide:%python_provide python2-%{name}} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Provides: %{name}-python = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} - -%description -n python2-%{name} -LCM is a library for message passing and data marshaling targeted at real time -systems where high-bandwidth and low latency are critical. - - %package -n python3-%{name} Summary: Lightweight communications and marshaling Python 3 bindings %{?python_provide:%python_provide python3-%{name}} @@ -73,7 +60,7 @@ systems where high-bandwidth and low latency are critical. %package devel Summary: Lightweight communications and marshaling development files Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-python%{?_isa} = %{version}-%{release} +Requires: python3-%{name}%{?_isa} = %{version}-%{release} Requires: %{name}-java = %{version}-%{release} %description devel @@ -86,28 +73,8 @@ This package provides the development files for the various lcm packages. %prep %setup -q -# Make a dir for building lcm with Python 2 bindings and copy sources there -mkdir PYTHON2_BUILD_DIR -# This allows the !(globing) syntax so cp doesn't throw an error that it can't -# copy a directory into itself -shopt -s extglob -# It is important to add the -a archive flag, bucause the make file is checking -# timestamps of certain files -cp -ar !(PYTHON2_BUILD_DIR) PYTHON2_BUILD_DIR/ - %build -# Build with Python 2 bindings in a separate directory -pushd PYTHON2_BUILD_DIR -export PYTHON=%{__python2} -%configure \ - --disable-static \ - --disable-rpath \ - --without-examples \ - --with-jardir=%{_datadir}/java -make V=1 %{?_smp_mflags} -popd - -# Build with Python 3 bindings +# Build with Python 3 bindings only export PYTHON=%{__python3} %configure \ --disable-static \ @@ -118,14 +85,7 @@ make V=1 %{?_smp_mflags} %install -rm -rf %{buildroot} - -# Install with Python 2 bindings -pushd PYTHON2_BUILD_DIR -make DESTDIR=%{buildroot} install -popd - -# Install with Python 3 bindings +# Install with Python 3 bindings only make DESTDIR=%{buildroot} install %{javadoc} -Xdoclint:none -d %{buildroot}/%{_javadocdir}/%{name} -sourcepath lcm-java \ @@ -135,7 +95,6 @@ make DESTDIR=%{buildroot} install find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print find %{buildroot}%{_bindir} -type f -name "lcm-logplayer" -print -exec chrpath --delete {} \; find %{buildroot}%{_bindir} -type f -name "lcm-logger" -print -exec chrpath --delete {} \; -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 {} \; %check @@ -174,10 +133,6 @@ make check V=1 %{_javadocdir}/%{name}/ -%files -n python2-%{name} -%{python2_sitearch}/lcm/ - - %files -n python3-%{name} %{python3_sitearch}/lcm/ @@ -191,6 +146,9 @@ make check V=1 %changelog +* Wed Jun 19 2019 Miro Hrončok - 1.3.1-12 +- Package python2-lcm was removed (#1629812) + * Fri Feb 01 2019 Fedora Release Engineering - 1.3.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild