diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-11-05 13:35:40 +0100 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-11-05 13:39:18 +0100 |
| commit | 9160dd8fffa5b93efe9a8fc24803adb78694b0de (patch) | |
| tree | 141fbe36c7da0e5237550cf0f8e96b620be95c5d | |
| parent | 44197f648311108b2bf8cb9a4415fba200f0238a (diff) | |
| download | xkeyboard-config-9160dd8fffa5b93efe9a8fc24803adb78694b0de.tar.gz xkeyboard-config-9160dd8fffa5b93efe9a8fc24803adb78694b0de.tar.bz2 xkeyboard-config-9160dd8fffa5b93efe9a8fc24803adb78694b0de.zip | |
Bump to version 2.12tizen_3.0_ivi_releasesubmit/tizen_wearable/20150127.000002submit/tizen_tv/20150130.050505submit/tizen_mobile/20150128.000000submit/tizen_ivi/20150108.333333submit/tizen_ivi/20150108.222222submit/tizen_ivi/20150108.111111submit/tizen_common/20150106.090727accepted/tizen/wearable/20150129.005545accepted/tizen/mobile/20150129.040543accepted/tizen/ivi/20150113.060257accepted/tizen/common/20150106.140233tizen_3.0_ivitizen_3.0.2015.q1_commontizen_3.0.2014.q4_commonsandbox/kevinthierry/bump-2.12
Use upstream git repo instead of pristin-tar.
Also clean spec file.
Bug-Tizen: TC-1879
Change-Id: Ia6a374deb20f711e0970d2d331837ba4b44637c4
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
| -rw-r--r-- | .gbs.conf | 3 | ||||
| -rw-r--r-- | packaging/xkeyboard-config.spec | 24 |
2 files changed, 14 insertions, 13 deletions
diff --git a/.gbs.conf b/.gbs.conf new file mode 100644 index 00000000..2ca3483e --- /dev/null +++ b/.gbs.conf @@ -0,0 +1,3 @@ +[general] +upstream_branch = upstream/master +upstream_tag = xkeyboard-config-${upstreamversion} diff --git a/packaging/xkeyboard-config.spec b/packaging/xkeyboard-config.spec index b858e275..04ae3352 100644 --- a/packaging/xkeyboard-config.spec +++ b/packaging/xkeyboard-config.spec @@ -1,14 +1,14 @@ %bcond_with x Name: xkeyboard-config -Version: 2.11 +Version: 2.12 Release: 0 -License: GPL-2.0+ ; LGPL-2.1+ ; MIT +License: GPL-2.0+ and LGPL-2.1+ and MIT Summary: The X Keyboard Extension Url: http://www.freedesktop.org/Software/XKeyboardConfig -Group: System/X11/Utilities +Group: System/Utilities Source: http://xorg.freedesktop.org/releases/individual/data/%{name}-%{version}.tar.bz2 -Source1001: xkeyboard-config.manifest +Source1001: xkeyboard-config.manifest BuildRequires: fdupes BuildRequires: intltool BuildRequires: perl-XML-Parser @@ -44,25 +44,23 @@ cp %{SOURCE1001} . --disable-runtime-deps \ --disable-xkbcomp-symlink rm -f */*.dir -make +%__make %install %make_install mkdir -p %{buildroot}%{_localstatedir}/lib/xkb -ln -snf /usr/bin/xkbcomp %{buildroot}/usr/share/X11/xkb/xkbcomp +ln -snf %{_bindir}/xkbcomp %{buildroot}%{_datadir}/X11/xkb/xkbcomp # Bug 335553 mkdir -p %{buildroot}%{_localstatedir}/lib/xkb/compiled/ -ln -snf /var/lib/xkb/compiled/ %{buildroot}/usr/share/X11/xkb/compiled +ln -snf /var/lib/xkb/compiled/ %{buildroot}%{_datadir}/X11/xkb/compiled %find_lang %{name} -%fdupes -s %{buildroot}/usr/share/X11/xkb +%fdupes -s %{buildroot}%{_datadir}/X11/xkb %files -f %{name}.lang %manifest %{name}.manifest %defattr(-,root,root) -%doc AUTHORS COPYING README docs/HOWTO.* docs/README.* -%dir %{_localstatedir}/lib/xkb +%doc AUTHORS README docs/HOWTO.* docs/README.* +%license COPYING %dir %{_localstatedir}/lib/xkb/compiled -/usr/share/X11/xkb/ +%{_datadir}/X11/xkb/ %{_datadir}/pkgconfig/*.pc - -%changelog |