From 725ea4e69551e906ed181002c1bd0c90e80b3adb29df62cd607b567e14a8e1ea Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 Apr 2013 05:46:36 +0000 Subject: [PATCH 1/4] wayland-1.1.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=25 --- wayland-1.0.6.tar.xz | 3 --- wayland-1.1.0.tar.xz | 3 +++ wayland.changes | 8 ++++++++ wayland.spec | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 wayland-1.0.6.tar.xz create mode 100644 wayland-1.1.0.tar.xz diff --git a/wayland-1.0.6.tar.xz b/wayland-1.0.6.tar.xz deleted file mode 100644 index d6416cd..0000000 --- a/wayland-1.0.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f52a012df699eff434b0f49e56000d6978b5f781048402ca8e0232242970fc49 -size 391348 diff --git a/wayland-1.1.0.tar.xz b/wayland-1.1.0.tar.xz new file mode 100644 index 0000000..cbae36c --- /dev/null +++ b/wayland-1.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ef587cf1a0e52b6dee44eeb9c288110e8180819abf4e419d247dfe234867a5c +size 401932 diff --git a/wayland.changes b/wayland.changes index a0fa174..2ac3d12 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 17 05:41:15 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 1.1.0 +* Optimize damage handling when moving surfaces in and out of planes +* Touch screen calibration feature and client +* Proper support for popup surfaces + ------------------------------------------------------------------- Sun Mar 24 15:46:12 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/wayland.spec b/wayland.spec index 2ef30f4..525cb11 100644 --- a/wayland.spec +++ b/wayland.spec @@ -18,7 +18,7 @@ Name: wayland %define lname libwayland0 -Version: 1.0.6 +Version: 1.1.0 Release: 0 Summary: Wayland Compositor Infrastructure License: HPND @@ -143,5 +143,6 @@ XDG_RUNTIME_DIR="$PWD/xdg" make check %{?_smp_mflags}; %_libdir/libwayland-*.so %_libdir/pkgconfig/wayland-*.pc %_datadir/aclocal +%_mandir/man3/wl_*.3* %changelog From cb46fb1b83c3ea2833fc9f5ae0ee09c5e439313de07a8c3eb6d6da7c28c792f1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 Apr 2013 05:54:35 +0000 Subject: [PATCH 2/4] Update baselibs: do not require non-existing package OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=26 --- baselibs.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/baselibs.conf b/baselibs.conf index 324ede5..7f252b3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,6 +2,7 @@ libwayland-server0 libwayland-client0 libwayland-cursor0 wayland-devel + requires -wayland- requires "libwayland-server0- = " requires "libwayland-client0- = " requires "libwayland-cursor0- = " From 2fc6a9ef2b370eb773a8cfd4ed6ae06040b9d5cbb8e1014cad227983e9b8517b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 Apr 2013 05:56:07 +0000 Subject: [PATCH 3/4] Full URL OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=27 --- wayland.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 525cb11..11b49bb 100644 --- a/wayland.spec +++ b/wayland.spec @@ -27,7 +27,7 @@ Url: http://wayland.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/wayland/wayland #Git-Web: http://cgit.freedesktop.org/wayland/wayland/ -Source: %name-%version.tar.xz +Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.64 #git#BuildRequires: automake >= 1.11 From c108afff185054367a0817662c24870eafbb5b0f197ef2dabf6809adc387c815 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 Apr 2013 06:10:08 +0000 Subject: [PATCH 4/4] New header location OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=28 --- wayland.changes | 1 + wayland.spec | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wayland.changes b/wayland.changes index 2ac3d12..3b9da55 100644 --- a/wayland.changes +++ b/wayland.changes @@ -5,6 +5,7 @@ Wed Apr 17 05:41:15 UTC 2013 - jengelh@inai.de * Optimize damage handling when moving surfaces in and out of planes * Touch screen calibration feature and client * Proper support for popup surfaces +- Use a header location that does not change with every release ------------------------------------------------------------------- Sun Mar 24 15:46:12 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/wayland.spec b/wayland.spec index 11b49bb..1bce6fe 100644 --- a/wayland.spec +++ b/wayland.spec @@ -105,7 +105,8 @@ to develop applications that require these. if [ ! -e configure ]; then autoreconf -fi; fi; -%configure --disable-static --includedir=%_includedir/%name-%version +# Ensure people will use pkgconfig to locate headers +%configure --disable-static --includedir="%_includedir/pkg/%name" make %{?_smp_mflags} %install @@ -139,7 +140,7 @@ XDG_RUNTIME_DIR="$PWD/xdg" make check %{?_smp_mflags}; %files devel %defattr(-,root,root) %_bindir/wayland-scanner -%_includedir/%name-%version +%_includedir/pkg/ %_libdir/libwayland-*.so %_libdir/pkgconfig/wayland-*.pc %_datadir/aclocal