Accepting request 625820 from home:dimstar:Factory

- Replace deprecated macro py_sitedir with python_sitearch.

I was under the impression I submitted this already - but can't find any
reference for it... so redo

OBS-URL: https://build.opensuse.org/request/show/625820
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gamin?expand=0&rev=17
This commit is contained in:
Dirk Mueller 2018-07-31 06:56:07 +00:00 committed by Git OBS Bridge
parent 9e1eb21fb1
commit 4aef13e963
3 changed files with 29 additions and 27 deletions

View File

@ -1,7 +1,7 @@
#
# spec file for package gamin-devel
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,22 +16,17 @@
#
Name: gamin-devel
Version: 0.1.10
Release: 0
%define sonum 0
%define vernum 1
%define packnum %{vernum}-%{sonum}
%define famnum 0
Name: gamin-devel
Version: 0.1.10
Release: 0
Summary: Libraries and includes to build against gamin
License: LGPL-2.1
License: LGPL-2.1-only
Group: Development/Libraries/C and C++
# Both have libfam.so
Conflicts: fam-devel
Requires: libfam%{famnum}-gamin = %{version}
Requires: libgamin-%{packnum} = %{version}
Provides: %{name}-static = %{version}
Url: http://www.gnome.org/~veillard/gamin/
URL: http://www.gnome.org/~veillard/gamin/
Source: http://www.gnome.org/~veillard/gamin/sources/gamin-%{version}.tar.gz
Source2: gamin-rpmlintrc
Patch0: gamin-return.patch
@ -46,8 +41,12 @@ BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
BuildRequires: pkgconfig
Requires: libfam%{famnum}-gamin = %{version}
Requires: libgamin-%{packnum} = %{version}
# Both have libfam.so
Conflicts: fam-devel
Provides: %{name}-static = %{version}
# No glib* requires here to avoid build cycles
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Libraries, includes, etc. to use and build against gamin.
@ -55,9 +54,9 @@ Libraries, includes, etc. to use and build against gamin.
%package -n libgamin-%{packnum}
Summary: Library providing the FAM File Alteration Monitor API
Group: System/Libraries
Requires: gamin-server >= %{version}
Provides: libgamin = %{version}
Obsoletes: libgamin < %{version}
Requires: gamin-server >= %{version}
%description -n libgamin-%{packnum}
This C library provides an API and ABI compatible file alteration
@ -67,8 +66,8 @@ daemon.
%package -n libfam%{famnum}-gamin
Summary: Library providing the FAM File Alteration Monitor API
Group: System/Libraries
Conflicts: libfam0
Requires: gamin-server >= %{version}
Conflicts: libfam0
%description -n libfam%{famnum}-gamin
This C library provides an API and ABI compatible file alteration

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 25 16:26:53 UTC 2018 - dimstar@opensuse.org
- Replace deprecated macro py_sitedir with python_sitearch.
-------------------------------------------------------------------
Fri Jan 10 10:08:35 UTC 2014 - adrian@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package gamin
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,17 +16,17 @@
#
Name: gamin
Version: 0.1.10
Release: 0
%define sonum 0
%define vernum 1
%define packnum %{vernum}-%{sonum}
%define famnum 0
Name: gamin
Version: 0.1.10
Release: 0
Summary: Library providing the FAM File Alteration Monitor API
License: LGPL-2.1
License: LGPL-2.1-only
Group: System/Daemons
Url: http://www.gnome.org/~veillard/%{name}/
URL: http://www.gnome.org/~veillard/%{name}/
Source: http://www.gnome.org/~veillard/%{name}/sources/%{name}-%{version}.tar.gz
Source2: %name-rpmlintrc
Patch0: gamin-return.patch
@ -43,7 +43,6 @@ BuildRequires: libstdc++-devel
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: pkgconfig(glib-2.0)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This C library provides an API and ABI compatible file alteration
@ -53,10 +52,9 @@ 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}
%py_requires
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
@ -115,8 +113,8 @@ make tests || echo "**** WARNING TESTSUITE FAILS ****"
%files -n python-%{name}
%defattr(-,root,root)
%doc .rpmdoc/python/*
%{py_sitedir}/gamin.py*
%{py_sitedir}/_gamin*
%{python_sitearch}/gamin.py*
%{python_sitearch}/_gamin*
%files server
%defattr(-, root, root)