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:
parent
7d869c1308
commit
21c8d9532a
@ -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
|
Mon Mar 5 14:30:29 UTC 2018 - sndirsch@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package util-macros
|
# 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
|
# 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
|
||||||
@ -12,36 +12,32 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# 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
|
Name: util-macros
|
||||||
Version: 1.19.2
|
Version: 1.19.2
|
||||||
Release: 0
|
Release: 0
|
||||||
BuildRequires: pkg-config
|
Summary: The X Protocol
|
||||||
|
#Source URL: http://xorg.freedesktop.org/releases/individual/util/
|
||||||
#BuildRequires: autoconf >= 2.60
|
#BuildRequires: autoconf >= 2.60
|
||||||
#BuildRequires: automake
|
#BuildRequires: automake
|
||||||
#BuildRequires: libtool
|
#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
|
License: HPND
|
||||||
Group: Development/Libraries/X11
|
Group: Development/Libraries/X11
|
||||||
|
URL: https://xorg.freedesktop.org/
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
|
BuildRequires: pkgconfig
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Utility Macro Headers for X development
|
Utility Macro Headers for X development
|
||||||
|
|
||||||
%package -n %{name}-devel
|
%package -n %{name}-devel
|
||||||
Summary: The X Protocol
|
Summary: The X Protocol
|
||||||
Group: Development/Libraries/X11
|
|
||||||
|
|
||||||
# Added within the 13.2 Development Cycle
|
# 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
|
%description -n %{name}-devel
|
||||||
Utility Macro Headers for X development
|
Utility Macro Headers for X development
|
||||||
@ -51,18 +47,18 @@ Utility Macro Headers for X development
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
#autoreconf -fi
|
#autoreconf -fi
|
||||||
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
|
./configure CFLAGS="%{optflags} -fno-strict-aliasing" \
|
||||||
--prefix=/usr --libdir=%{_libdir}
|
--prefix=%{_prefix} --libdir=%{_libdir}
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR="%buildroot"
|
%make_install
|
||||||
rm -f $RPM_BUILD_ROOT/usr/share/util-macros/INSTALL
|
rm -f %{buildroot}%{_datadir}/util-macros/INSTALL
|
||||||
|
|
||||||
%files -n %{name}-devel
|
%files -n %{name}-devel
|
||||||
%defattr(-,root,root)
|
%license COPYING
|
||||||
%doc COPYING
|
%dir %{_datadir}/aclocal
|
||||||
/usr/share/aclocal/*.m4
|
%{_datadir}/aclocal/*.m4
|
||||||
/usr/share/pkgconfig/*.pc
|
%{_datadir}/pkgconfig/*.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user