3
0
forked from pool/util-macros

Accepting request 721721 from home:dimstar:Factory

- Own %{_datadir}/aclocal: when we might switch to pkgconf instead
  of pkg-config, nothing in the build root is 'accidentally' owning
  this directory for us.

OBS-URL: https://build.opensuse.org/request/show/721721
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/util-macros?expand=0&rev=10
This commit is contained in:
Stefan Dirsch 2019-08-19 00:07:59 +00:00 committed by Git OBS Bridge
parent 7d869c1308
commit 21c8d9532a
2 changed files with 24 additions and 21 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 8 11:01:27 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Own %{_datadir}/aclocal: when we might switch to pkgconf instead
of pkg-config, nothing in the build root is 'accidentally' owning
this directory for us.
-------------------------------------------------------------------
Mon Mar 5 14:30:29 UTC 2018 - sndirsch@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package util-macros
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 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
@ -12,36 +12,32 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: util-macros
Version: 1.19.2
Release: 0
BuildRequires: pkg-config
Summary: The X Protocol
#Source URL: http://xorg.freedesktop.org/releases/individual/util/
#BuildRequires: autoconf >= 2.60
#BuildRequires: automake
#BuildRequires: libtool
Url: http://xorg.freedesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: The X Protocol
#Source URL: http://xorg.freedesktop.org/releases/individual/util/
License: HPND
Group: Development/Libraries/X11
URL: https://xorg.freedesktop.org/
Source: %{name}-%{version}.tar.bz2
BuildRequires: pkgconfig
%description
Utility Macro Headers for X development
%package -n %{name}-devel
Summary: The X Protocol
Group: Development/Libraries/X11
# Added within the 13.2 Development Cycle
Provides: xorg-x11-proto-devel://usr/%{_lib}/pkgconfig/xorg-macros.pc
Group: Development/Libraries/X11
Provides: xorg-x11-proto-devel:/%{_libdir}/pkgconfig/xorg-macros.pc
%description -n %{name}-devel
Utility Macro Headers for X development
@ -51,18 +47,18 @@ Utility Macro Headers for X development
%build
#autoreconf -fi
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--prefix=/usr --libdir=%{_libdir}
./configure CFLAGS="%{optflags} -fno-strict-aliasing" \
--prefix=%{_prefix} --libdir=%{_libdir}
make %{?_smp_mflags}
%install
make install DESTDIR="%buildroot"
rm -f $RPM_BUILD_ROOT/usr/share/util-macros/INSTALL
%make_install
rm -f %{buildroot}%{_datadir}/util-macros/INSTALL
%files -n %{name}-devel
%defattr(-,root,root)
%doc COPYING
/usr/share/aclocal/*.m4
/usr/share/pkgconfig/*.pc
%license COPYING
%dir %{_datadir}/aclocal
%{_datadir}/aclocal/*.m4
%{_datadir}/pkgconfig/*.pc
%changelog