Accepting request 721720 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/721720 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xtrans?expand=0&rev=23
This commit is contained in:
parent
92eec8751f
commit
22a3fe1629
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 8 10:59:38 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.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Mar 22 13:38:03 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
|
Fri Mar 22 13:38:03 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
|
||||||
|
|
||||||
|
14
xtrans.spec
14
xtrans.spec
@ -12,7 +12,7 @@
|
|||||||
# 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/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@ -22,11 +22,11 @@ Release: 0
|
|||||||
Summary: Library to handle network protocol transport in X
|
Summary: Library to handle network protocol transport in X
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Development/Libraries/X11
|
Group: Development/Libraries/X11
|
||||||
Url: http://xorg.freedesktop.org/
|
URL: https://xorg.freedesktop.org/
|
||||||
Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
|
Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
|
||||||
Patch0: p_xauth.diff
|
Patch0: p_xauth.diff
|
||||||
Patch1: n_unifdef-LBXPROXY_t-and-TEST_t.patch
|
Patch1: n_unifdef-LBXPROXY_t-and-TEST_t.patch
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconfig(xorg-macros) >= 1.12
|
BuildRequires: pkgconfig(xorg-macros) >= 1.12
|
||||||
BuildRequires: pkgconfig(xshmfence)
|
BuildRequires: pkgconfig(xshmfence)
|
||||||
# Package was named xorg-x11-xtrans-devel until 12.2
|
# Package was named xorg-x11-xtrans-devel until 12.2
|
||||||
@ -34,7 +34,6 @@ BuildRequires: pkgconfig(xshmfence)
|
|||||||
# X11R7.7 is in RC1, and xorg-x11-xtrans-devel was version 7.6
|
# X11R7.7 is in RC1, and xorg-x11-xtrans-devel was version 7.6
|
||||||
Provides: xorg-x11-xtrans-devel = 7.7
|
Provides: xorg-x11-xtrans-devel = 7.7
|
||||||
Obsoletes: xorg-x11-xtrans-devel < 7.7
|
Obsoletes: xorg-x11-xtrans-devel < 7.7
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -45,7 +44,7 @@ libX11, libICE, the X font server, and related components.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0
|
%patch0
|
||||||
%patch1 -p1 -R
|
%patch1 -p1 -R
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -60,10 +59,11 @@ test -L usr/include/X11 && rm usr/include/X11
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%license COPYING
|
||||||
%doc AUTHORS ChangeLog COPYING README.md
|
%doc AUTHORS ChangeLog README.md
|
||||||
%doc doc/xtrans.xml
|
%doc doc/xtrans.xml
|
||||||
%{_includedir}/X11/Xtrans/
|
%{_includedir}/X11/Xtrans/
|
||||||
|
%dir %{_datadir}/aclocal
|
||||||
%{_datadir}/aclocal/xtrans.m4
|
%{_datadir}/aclocal/xtrans.m4
|
||||||
%{_datadir}/pkgconfig/xtrans.pc
|
%{_datadir}/pkgconfig/xtrans.pc
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user