rpms/libxkbcommon
7
0
Fork 0
Code Issues Pull Requests Releases Activity

xkbcommon 0.4.2 (#1000497)

Browse Source 
- own %{_includedir}/xkbcommon/
- -x11: +ldconfig scriptlets
- -devel: don't include xkbcommon-x11.h
- run reautoconf in %prep (instead of %build)
- tighten subpkg deps via %_isa
- .spec cleanup, remove deprecated stuff
- BR: pkgconfig(xcb-xkb) >= 1.10
This commit is contained in:
Rex Dieter 2014-05-22 08:10:23 -05:00 committed by Hans de Goede
parent 45d07523f9
commit bd8314e609
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libxkbcommon.spec
View File

@ -1,11 +1,10 @@
#global gitdate 20120917 #global gitdate 20120917
Name: libxkbcommon Name: libxkbcommon
Version: 0.4.0 Version: 0.4.2
Release: 1%{?gitdate:.%{gitdate}}%{?dist} Release: 1%{?gitdate:.%{gitdate}}%{?dist}
Summary: X.Org X11 XKB parsing library Summary: X.Org X11 XKB parsing library
License: MIT License: MIT
Group: System Environment/Libraries
URL: http://www.x.org URL: http://www.x.org
%if 0%{?gitdate} %if 0%{?gitdate}
@ -19,6 +18,7 @@ BuildRequires: autoconf automake libtool
BuildRequires: xorg-x11-util-macros byacc flex bison BuildRequires: xorg-x11-util-macros byacc flex bison
BuildRequires: xorg-x11-proto-devel libX11-devel BuildRequires: xorg-x11-proto-devel libX11-devel
BuildRequires: xkeyboard-config-devel BuildRequires: xkeyboard-config-devel
BuildRequires: pkgconfig(xcb-xkb) >= 1.10
%description %description
%{name} is the X.Org library for compiling XKB maps into formats usable by %{name} is the X.Org library for compiling XKB maps into formats usable by
@ -26,19 +26,14 @@ the X Server or other display servers.
%package devel %package devel
Summary: X.Org X11 XKB parsing development package Summary: X.Org X11 XKB parsing development package
Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description devel %description devel
X.Org X11 XKB parsing development package X.Org X11 XKB parsing development package
%prep
%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%package x11 %package x11
Summary: X.Org X11 XKB keymap creation library Summary: X.Org X11 XKB keymap creation library
Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description x11 %description x11
%{name}-x11 is the X.Org library for creating keymaps by querying the X %{name}-x11 is the X.Org library for creating keymaps by querying the X
@ -46,14 +41,17 @@ server.
%package x11-devel %package x11-devel
Summary: X.Org X11 XKB keymap creation library Summary: X.Org X11 XKB keymap creation library
Group: Development/Libraries Requires: %{name}-x11%{?_isa} = %{version}-%{release}
Requires: %{name}-x11 = %{version}-%{release}
%description x11-devel %description x11-devel
X.Org X11 XKB keymap creation library development package X.Org X11 XKB keymap creation library development package
%build %prep
%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
autoreconf -v --install || exit 1 autoreconf -v --install || exit 1
%build
%configure --disable-static %configure --disable-static
make %{?_smp_mflags} make %{?_smp_mflags}
@ -61,35 +59,48 @@ make %{?_smp_mflags}
%install %install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-)
%doc COPYING %doc COPYING
%{_libdir}/libxkbcommon.so.0.0.0 %{_libdir}/libxkbcommon.so.0.0.0
%{_libdir}/libxkbcommon.so.0 %{_libdir}/libxkbcommon.so.0
%files devel %files devel
%defattr(-,root,root,-)
%{_libdir}/libxkbcommon.so %{_libdir}/libxkbcommon.so
%{_includedir}/xkbcommon/xkbcommon*.h %dir %{_includedir}/xkbcommon/
%{_includedir}/xkbcommon/xkbcommon.h
%{_includedir}/xkbcommon/xkbcommon-compat.h
%{_includedir}/xkbcommon/xkbcommon-keysyms.h
%{_includedir}/xkbcommon/xkbcommon-names.h
%{_libdir}/pkgconfig/xkbcommon.pc %{_libdir}/pkgconfig/xkbcommon.pc
%post x11 -p /sbin/ldconfig
%postun x11 -p /sbin/ldconfig
%files x11 %files x11
%defattr(-,root,root,-)
%{_libdir}/libxkbcommon-x11.so.0.0.0 %{_libdir}/libxkbcommon-x11.so.0.0.0
%{_libdir}/libxkbcommon-x11.so.0 %{_libdir}/libxkbcommon-x11.so.0
%files x11-devel %files x11-devel
%defattr(-,root,root,-)
%{_libdir}/libxkbcommon-x11.so %{_libdir}/libxkbcommon-x11.so
%{_includedir}/xkbcommon/xkbcommon-x11.h %{_includedir}/xkbcommon/xkbcommon-x11.h
%{_libdir}/pkgconfig/xkbcommon-x11.pc %{_libdir}/pkgconfig/xkbcommon-x11.pc
%changelog %changelog
* Thu May 22 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.4.2-1
- xkbcommon 0.4.2 (#1000497)
- own %%{_includedir}/xkbcommon/
- -x11: +ldconfig scriptlets
- -devel: don't include xkbcommon-x11.h
- run reautoconf in %%prep (instead of %%build)
- tighten subpkg deps via %%_isa
- .spec cleanup, remove deprecated stuff
- BR: pkgconfig(xcb-xkb) >= 1.10
* Wed Feb 05 2014 Peter Hutterer <peter.hutterer@redhat.com> 0.4.0-1 * Wed Feb 05 2014 Peter Hutterer <peter.hutterer@redhat.com> 0.4.0-1
- xkbcommon 0.4.0 - xkbcommon 0.4.0
- Add new xkbcommon-x11 and xkbcommon-x11-devel subpackages - Add new xkbcommon-x11 and xkbcommon-x11-devel subpackages