From bba8c2ee2c2a262d6e5a47b74d856600201e2c2fa2b17cbbac68ccb542939eb5 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 7 Apr 2021 17:00:12 +0000 Subject: [PATCH] Accepting request 883661 from home:dirkmueller:Factory - do not own directories provided by filesystem - small cleanups inspired by spec-cleaner OBS-URL: https://build.opensuse.org/request/show/883661 OBS-URL: https://build.opensuse.org/package/show/devel:tools/pkgconf?expand=0&rev=22 --- pkgconf.changes | 6 ++++++ pkgconf.spec | 23 ++++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgconf.changes b/pkgconf.changes index bd9b693..1bde55a 100644 --- a/pkgconf.changes +++ b/pkgconf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 7 16:19:46 UTC 2021 - Dirk Müller + +- do not own directories provided by filesystem +- small cleanups inspired by spec-cleaner + ------------------------------------------------------------------- Mon Aug 10 05:03:07 UTC 2020 - Neal Gompa diff --git a/pkgconf.spec b/pkgconf.spec index d79ca6d..725ae2f 100644 --- a/pkgconf.spec +++ b/pkgconf.spec @@ -1,7 +1,7 @@ # # spec file for package pkgconf # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2020 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -52,21 +52,16 @@ License: ISC Group: Development/Tools/Building URL: http://pkgconf.org/ Source0: https://distfiles.dereferenced.org/%{name}/%{name}-%{version}.tar.xz - # Simple wrapper script to offer platform versions of pkgconfig from Fedora Source1: platform-pkg-config.in - -BuildRequires: gcc -BuildRequires: make - # For regenerating autotools scripts BuildRequires: autoconf BuildRequires: automake +BuildRequires: gcc BuildRequires: libtool - +BuildRequires: make # pkgconf uses libpkgconf internally Requires: %{libname}%{?_isa} = %{version}-%{release} - # This is defined within pkgconf code as a virtual pc (just like in pkgconfig) Provides: pkgconfig(pkgconf) = %{version} @@ -88,9 +83,9 @@ of %{name}. Summary: Development files for lib%{name} License: ISC Group: Development/Libraries/C and C++ +Requires: %{libname}%{?_isa} = %{version}-%{release} # Avoid dependency loop on itself by specifying the Provides directly Provides: pkgconfig(libpkgconf) = %{version} -Requires: %{libname}%{?_isa} = %{version}-%{release} %description -n %{devname} This package provides files necessary for developing applications @@ -144,12 +139,12 @@ autoreconf -fiv --with-system-includedir=%{_includedir} \ --with-system-libdir=%{_libdir} -%make_build V=1 +%make_build %install %make_install -find %{buildroot} -name '*.la' -print -delete +find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}%{_sysconfdir}/pkgconfig/personality.d mkdir -p %{buildroot}%{_datadir}/pkgconfig/personality.d @@ -221,14 +216,12 @@ rm -rf %{buildroot}%{_mandir}/man7 %files m4 %dir %{_datadir}/aclocal %{_datadir}/aclocal/pkg.m4 -%{_mandir}/man7/pkg.m4.7* +%{_mandir}/man7/pkg.m4.7%{?ext_man} %files pkg-config %{_bindir}/pkg-config %{_bindir}/%{pkgconf_target_platform}-pkg-config -%{_mandir}/man1/pkg-config.1* -%dir %{_libdir}/pkgconfig -%dir %{_datadir}/pkgconfig +%{_mandir}/man1/pkg-config.1%{?ext_man} %endif %changelog