Accepting request 762486 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/762486
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gamin?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2020-01-12 22:17:48 +00:00 committed by Git OBS Bridge
commit d7f14c85f5
4 changed files with 10 additions and 41 deletions

View File

@ -1,7 +1,7 @@
# #
# spec file for package gamin-devel # spec file for package gamin-devel
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -31,7 +31,6 @@ Source: http://www.gnome.org/~veillard/gamin/sources/gamin-%{version}.ta
Source2: gamin-rpmlintrc Source2: gamin-rpmlintrc
Patch0: gamin-return.patch Patch0: gamin-return.patch
Patch1: gamin-fam_abi_compatibility_FamErrlist.patch Patch1: gamin-fam_abi_compatibility_FamErrlist.patch
Patch2: gamin-fix_python_main.patch
Patch3: gamin-obsol-glib.diff Patch3: gamin-obsol-glib.diff
# PATCH-FIX-UPSTREAM gamin-0.1.11-double-lock.patch (bgo#669292) # PATCH-FIX-UPSTREAM gamin-0.1.11-double-lock.patch (bgo#669292)
Patch4: gamin-0.1.11-double-lock.patch Patch4: gamin-0.1.11-double-lock.patch
@ -78,7 +77,6 @@ daemon.
%setup -q -n gamin-%version %setup -q -n gamin-%version
%patch0 -p0 %patch0 -p0
%patch1 %patch1
%patch2
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1

View File

@ -1,14 +0,0 @@
--- python/gamin.py.orig 2011-02-13 21:06:20.000000000 +0100
+++ python/gamin.py 2011-02-13 21:06:27.000000000 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
import _gamin
import os.path
@@ -253,5 +251,3 @@
print "disconnecting"
del mon
-if __name__ == '__main__':
- run_unit_tests()

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 9 13:23:06 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Disable python bindings (python2-only):
+ Drop python-devel BuildRequires.
+ Drop gamin-fix_python_main.patch: no longer needed.
+ No longer build python-gamin sub-package.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 6 09:33:25 UTC 2018 - dimstar@opensuse.org Mon Aug 6 09:33:25 UTC 2018 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package gamin # spec file for package gamin
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -32,7 +32,6 @@ Source2: %name-rpmlintrc
Source99: baselibs.conf Source99: baselibs.conf
Patch0: gamin-return.patch Patch0: gamin-return.patch
Patch1: gamin-fam_abi_compatibility_FamErrlist.patch Patch1: gamin-fam_abi_compatibility_FamErrlist.patch
Patch2: gamin-fix_python_main.patch
Patch3: gamin-obsol-glib.diff Patch3: gamin-obsol-glib.diff
# PATCH-FIX-UPSTREAM gamin-0.1.11-double-lock.patch (bgo#669292) # PATCH-FIX-UPSTREAM gamin-0.1.11-double-lock.patch (bgo#669292)
Patch4: gamin-0.1.11-double-lock.patch Patch4: gamin-0.1.11-double-lock.patch
@ -42,7 +41,6 @@ BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libstdc++-devel BuildRequires: libstdc++-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
%description %description
@ -50,18 +48,6 @@ This C library provides an API and ABI compatible file alteration
monitor mechanism compatible with FAM, but not dependent on a system wide monitor mechanism compatible with FAM, but not dependent on a system wide
daemon. daemon.
%package -n python-%{name}
Summary: Python bindings for the %{name} library
Group: Development/Libraries/Python
Requires: lib%{name}-%{packnum} = %{version}
Provides: %{name}-python = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
%description -n python-%{name}
The python-%{name} package contains a module that allow monitoring of
files and directories from the Python language based on the support
of the %{name} package.
%package doc %package doc
Summary: Documentation for %{name} Summary: Documentation for %{name}
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -84,7 +70,6 @@ It is split off into its own subpackage to void file conflicts when both
%setup -q %setup -q
%patch0 -p0 %patch0 -p0
%patch1 %patch1
%patch2
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
@ -96,8 +81,6 @@ make %{?_smp_mflags}
%install %install
%make_install %make_install
rm "%{buildroot}%{_libdir}"/*.la rm "%{buildroot}%{_libdir}"/*.la
mkdir -p .rpmdoc/python
mv doc/python.html .rpmdoc/python/doc.html
%fdupes %{buildroot} %fdupes %{buildroot}
# drop files which are build via libgamin spec file # drop files which are build via libgamin spec file
@ -111,12 +94,6 @@ rm %buildroot%{_includedir}/fam.h \
# tests are currently broken :/ # tests are currently broken :/
make tests || echo "**** WARNING TESTSUITE FAILS ****" make tests || echo "**** WARNING TESTSUITE FAILS ****"
%files -n python-%{name}
%defattr(-,root,root)
%doc .rpmdoc/python/*
%{python_sitearch}/gamin.py*
%{python_sitearch}/_gamin*
%files server %files server
%defattr(-, root, root) %defattr(-, root, root)
%{_libexecdir}/gam_server %{_libexecdir}/gam_server