#1 Remove python2 subpackage (#1627299)
Merged 5 years ago by churchyard. Opened 5 years ago by churchyard.
rpms/ churchyard/libwfut nopy2  into  master

file modified
+5 -31
@@ -1,11 +1,6 @@ 

- %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)

- %{!?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:           libwfut

  Version:        0.2.3

- Release:        16%{?dist}

+ Release:        17%{?dist}

  Summary:        Software updater tool for WorldForge applications

  

  Group:          Development/Libraries
@@ -18,7 +13,7 @@ 

  Patch0:         libwfut-0.2.3-Remove-reference-to-object_slot-h.patch

  

  BuildRequires:  gcc-c++

- BuildRequires:  libsigc++20-devel libcurl-devel zlib-devel tinyxml-devel python2-devel swig

+ BuildRequires:  libsigc++20-devel libcurl-devel zlib-devel tinyxml-devel swig

  

  %description

  libwfut is the WorldForge Update Tool (WFUT) client side implementation in C++
@@ -35,28 +30,10 @@ 

  Development libraries and headers for linking against the libwfut library.

  

  

- %package -n python2-libwfut

- %{?python_provide:%python_provide python2-libwfut}

- # Remove before F30

- Provides: %{name}-python = %{version}-%{release}

- Provides: %{name}-python%{?_isa} = %{version}-%{release}

- Obsoletes: %{name}-python < %{version}-%{release}

- Summary: Python interface for libwfut library

- Group:   Development/Libraries

- 

- 

- %description -n python2-libwfut

- Python interface for libwfut library.

- 

- 

  %prep

  %setup -q

  %patch0 -p1

  

- echo "python_sitelib == %{python_sitelib}"

- echo "python_sitearch == %{python_sitearch}"

- 

- 

  %build

  %configure --disable-static

  # Don't use rpath!
@@ -73,9 +50,6 @@ 

  #rm -f $RPM_BUILD_ROOT%{_libdir}/*.a

  rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

  

- #rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/*.a

- rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/*.la

- 

  # remove wfut binary from package - will return it back when java wfut package will be obsoleted

  rm -f $RPM_BUILD_ROOT%{_bindir}/wfut

  rm -f $RPM_BUILD_ROOT%{_mandir}/man1/wfut.1
@@ -101,11 +75,11 @@ 

  %{_libdir}/libwfut-0.2.so

  %{_libdir}/pkgconfig/*.pc

  

- %files -n python2-libwfut

- %{python2_sitearch}/%{name}

- 

  

  %changelog

+ * Mon Sep 17 2018 Miro Hrončok <mhroncok@redhat.com> - 0.2.3-17

+ - Remove python2 subpackage (#1627299)

+ 

  * Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.2.3-16

  - Rebuild with fixed binutils

  

no initial comment

Pull-Request has been merged by churchyard

5 years ago