diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e122c52 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libxkbcommon-0.7.1.tar.xz diff --git a/.libxkbcommon.metadata b/.libxkbcommon.metadata new file mode 100644 index 0000000..3091bb2 --- /dev/null +++ b/.libxkbcommon.metadata @@ -0,0 +1 @@ +6c0007a0206cd8bc1fa68f50aa86627d669282a2 SOURCES/libxkbcommon-0.7.1.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/make-git-snapshot.sh b/SOURCES/make-git-snapshot.sh new file mode 100755 index 0000000..507c2a0 --- /dev/null +++ b/SOURCES/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libxkbcommon-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://anongit.freedesktop.org/git/xorg/lib/libxkbcommon $DIRNAME +cd $DIRNAME +if [ -z "$1" ]; then + git log | head -1 +else + git checkout $1 +fi +git log | head -1 | awk '{ print $2 }' > ../commitid +git repack -a -d +cd .. +tar jcf $DIRNAME.tar.bz2 $DIRNAME +rm -rf $DIRNAME diff --git a/SPECS/libxkbcommon.spec b/SPECS/libxkbcommon.spec new file mode 100644 index 0000000..4cf3725 --- /dev/null +++ b/SPECS/libxkbcommon.spec @@ -0,0 +1,193 @@ +#global gitdate 20120917 + +Name: libxkbcommon +Version: 0.7.1 +Release: 1%{?gitdate:.%{gitdate}}%{?dist} +Summary: X.Org X11 XKB parsing library +License: MIT +URL: http://www.x.org + +%if 0%{?gitdate} +Source0: %{name}-%{gitdate}.tar.bz2 +%else +Source0: http://xkbcommon.org/download/%{name}-%{version}.tar.xz +%endif +Source1: make-git-snapshot.sh + +BuildRequires: autoconf automake libtool +BuildRequires: xorg-x11-util-macros byacc flex bison +BuildRequires: xorg-x11-proto-devel libX11-devel +BuildRequires: xkeyboard-config-devel +BuildRequires: pkgconfig(xcb-xkb) >= 1.10 + +Requires: xkeyboard-config + +%description +%{name} is the X.Org library for compiling XKB maps into formats usable by +the X Server or other display servers. + +%package devel +Summary: X.Org X11 XKB parsing development package +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +X.Org X11 XKB parsing development package + +%package x11 +Summary: X.Org X11 XKB keymap creation library +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description x11 +%{name}-x11 is the X.Org library for creating keymaps by querying the X +server. + +%package x11-devel +Summary: X.Org X11 XKB keymap creation library +Requires: %{name}-x11%{?_isa} = %{version}-%{release} + +%description x11-devel +X.Org X11 XKB keymap creation library development package + +%prep +%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} + +autoreconf -v --install || exit 1 + +%build +%configure \ + --disable-silent-rules \ + --disable-static \ + --enable-x11 \ + --disable-docs + +make %{?_smp_mflags} + +%install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + +find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%license LICENSE +%{_libdir}/libxkbcommon.so.0.0.0 +%{_libdir}/libxkbcommon.so.0 + +%files devel +%{_libdir}/libxkbcommon.so +%dir %{_includedir}/xkbcommon/ +%{_includedir}/xkbcommon/xkbcommon.h +%{_includedir}/xkbcommon/xkbcommon-compat.h +%{_includedir}/xkbcommon/xkbcommon-compose.h +%{_includedir}/xkbcommon/xkbcommon-keysyms.h +%{_includedir}/xkbcommon/xkbcommon-names.h +%{_libdir}/pkgconfig/xkbcommon.pc + +%post x11 -p /sbin/ldconfig +%postun x11 -p /sbin/ldconfig + +%files x11 +%{_libdir}/libxkbcommon-x11.so.0.0.0 +%{_libdir}/libxkbcommon-x11.so.0 + +%files x11-devel +%{_libdir}/libxkbcommon-x11.so +%{_includedir}/xkbcommon/xkbcommon-x11.h +%{_libdir}/pkgconfig/xkbcommon-x11.pc + +%changelog +* Thu Jan 19 2017 Peter Hutterer 0.7.1-1 +- xkbcommon 0.7.1 + +* Mon Nov 14 2016 Peter Hutterer 0.7.0-1 +- xkbcommon 0.7.0 + +* Fri Jun 03 2016 Peter Hutterer 0.6.1-1 +- xkbcommon 0.6.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 0.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 08 2016 Dan Horák - 0.5.0-3 +- always build the x11 subpackage + +* Wed Jun 17 2015 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Oct 22 2014 Hans de Goede - 0.5.0-1 +- Update to 0.5.0 (#1154574) + +* Mon Sep 22 2014 Kalev Lember - 0.4.3-2 +- Require xkeyboard-config (#1145260) + +* Wed Aug 20 2014 Kalev Lember - 0.4.3-1 +- Update to 0.4.3 + +* Sun Aug 17 2014 Fedora Release Engineering - 0.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 27 2014 Rex Dieter - 0.4.2-3 +- make -x11 support conditional (f21+, #1000497) +- --disable-silent-rules + +* Fri May 23 2014 Hans de Goede - 0.4.2-2 +- Bump release to 2 to avoid confusion with non official non scratch 0.4.2-1 + +* Thu May 22 2014 Rex Dieter - 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 0.4.0-1 +- xkbcommon 0.4.0 +- Add new xkbcommon-x11 and xkbcommon-x11-devel subpackages + +* Tue Aug 27 2013 Peter Hutterer 0.3.1-1 +- xkbcommon 0.3.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 0.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Apr 18 2013 Peter Hutterer 0.3.0-1 +- xkbcommon 0.3.0 + +* Thu Feb 14 2013 Fedora Release Engineering - 0.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Oct 23 2012 Adam Jackson 0.2.0-1 +- xkbcommon 0.2.0 + +* Mon Sep 17 2012 Thorsten Leemhuis 0.1.0-8.20120917 +- Today's git snapshot + +* Thu Jul 19 2012 Fedora Release Engineering - 0.1.0-7.20120306 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Mar 06 2012 Peter Hutterer 0.1.0-6.20120306 +- BuildRequire xkeyboard-config-devel to get the right XKB target path (#799717) + +* Tue Mar 06 2012 Peter Hutterer 0.1.0-5.20120306 +- Today's git snapshot + +* Fri Jan 13 2012 Fedora Release Engineering - 0.1.0-4.20111109 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 09 2011 Adam Jackson 0.1.0-3 +- Today's git snap + +* Tue Feb 08 2011 Fedora Release Engineering - 0.1.0-2.20101110 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Nov 06 2010 Dave Airlie 0.1.0-1.20101110 +- inital import +