From a438bdd58da9ec8388f879f902103863408c6025e485d1c80d788d8b5bb2e35e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Feb 2015 10:32:08 +0000 Subject: [PATCH 1/5] wayland-1.6.92 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=53 --- wayland-1.6.91.tar.xz | 3 --- wayland-1.6.92.tar.xz | 3 +++ wayland.changes | 4 ++-- wayland.spec | 21 ++++++++++++--------- 4 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 wayland-1.6.91.tar.xz create mode 100644 wayland-1.6.92.tar.xz diff --git a/wayland-1.6.91.tar.xz b/wayland-1.6.91.tar.xz deleted file mode 100644 index 8ef9cc4..0000000 --- a/wayland-1.6.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb8b4ecdab1e8bba2bd01fc564e4b198c57a82da6f77d5ddaadb0ec73daa5283 -size 427816 diff --git a/wayland-1.6.92.tar.xz b/wayland-1.6.92.tar.xz new file mode 100644 index 0000000..ebbda96 --- /dev/null +++ b/wayland-1.6.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c3e823c9bd4b36c5c63549be8b9a3af386d0a2477b65ae2f7a8a2387e0e0c4b +size 363868 diff --git a/wayland.changes b/wayland.changes index b630147..f7bfc08 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Jan 27 21:19:36 UTC 2015 - jengelh@inai.de +Mon Feb 2 10:20:12 UTC 2015 - jengelh@inai.de -- Update to new upstream prerelease 1.6.91 +- Update to new upstream prerelease 1.6.92 * The codebase's doxygen documentation was revamped ------------------------------------------------------------------- diff --git a/wayland.spec b/wayland.spec index e33021f..cf2c0db 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,7 +1,7 @@ # # spec file for package wayland # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,12 +18,12 @@ %define lname libwayland0 Name: wayland -Version: 1.6.91 +Version: 1.6.92 Release: 0 Summary: Wayland Compositor Infrastructure License: HPND Group: Development/Libraries/C and C++ -URL: http://wayland.freedesktop.org/ +Url: http://wayland.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/wayland/wayland #Git-Web: http://cgit.freedesktop.org/wayland/wayland/ @@ -34,13 +34,16 @@ Source3: baselibs.conf #git#BuildRequires: libtool >= 2.2 BuildRequires: doxygen BuildRequires: fdupes +BuildRequires: graphviz +BuildRequires: graphviz-gnome BuildRequires: libxml2-tools BuildRequires: libxslt-tools BuildRequires: pkgconfig -BuildRequires: xz xmlto +BuildRequires: xmlto +BuildRequires: xz BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libffi) -BuildRoot: %_tmppath/%name-%version-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Wayland is a protocol for a compositor to talk to its clients as well @@ -118,7 +121,7 @@ if [ ! -e configure ]; then autoreconf -fi; fi; %configure --disable-static --includedir="%_includedir/%name" \ - --docdir="%_defaultdocdir/%name" + --docdir="%_defaultdocdir/%name" --disable-doc make %{?_smp_mflags} V=1 %install @@ -128,10 +131,10 @@ find "%buildroot" -type f -name "*.la" -delete -print %check %if !0%{?qemu_user_space_build} -mkdir xdg -chmod 700 xdg +mkdir -p xdg/wayland-tests +chmod 700 xdg xdg/wayland-tests export XDG_RUNTIME_DIR="$PWD/xdg" -if ! make check %{?_smp_mflags} V=1; then +if ! make check V=1; then cat test-suite.log exit 1 fi From eaa9038605d2965159048b25ac76eb8ffc3f51570b1d41d407c963b8dfbe5c03 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Feb 2015 11:16:03 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=54 --- wayland.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wayland.changes b/wayland.changes index f7bfc08..a623c94 100644 --- a/wayland.changes +++ b/wayland.changes @@ -2,6 +2,12 @@ Mon Feb 2 10:20:12 UTC 2015 - jengelh@inai.de - Update to new upstream prerelease 1.6.92 +* More documentation updates + +------------------------------------------------------------------- +Tue Jan 27 21:19:36 UTC 2015 - jengelh@inai.de + +- Update to new upstream prerelease 1.6.91 * The codebase's doxygen documentation was revamped ------------------------------------------------------------------- From f58d1245064e77d657429b587995a5dcf610cada9eaa8c87314909fa4ed26f61 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Feb 2015 11:18:10 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=55 --- wayland.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index cf2c0db..5014d12 100644 --- a/wayland.spec +++ b/wayland.spec @@ -121,7 +121,7 @@ if [ ! -e configure ]; then autoreconf -fi; fi; %configure --disable-static --includedir="%_includedir/%name" \ - --docdir="%_defaultdocdir/%name" --disable-doc + --docdir="%_defaultdocdir/%name" make %{?_smp_mflags} V=1 %install From 8e8ccea7366a0e324909de9250eb659908071aab9087d2292146ac344fbaaea6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Feb 2015 17:11:46 +0000 Subject: [PATCH 4/5] Drop documentation, it creates a build loop OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=56 --- wayland.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/wayland.spec b/wayland.spec index 5014d12..f96091e 100644 --- a/wayland.spec +++ b/wayland.spec @@ -32,14 +32,10 @@ Source3: baselibs.conf #git#BuildRequires: autoconf >= 2.64 #git#BuildRequires: automake >= 1.11 #git#BuildRequires: libtool >= 2.2 -BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: graphviz -BuildRequires: graphviz-gnome BuildRequires: libxml2-tools BuildRequires: libxslt-tools -BuildRequires: pkgconfig -BuildRequires: xmlto +BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libffi) @@ -121,7 +117,7 @@ if [ ! -e configure ]; then autoreconf -fi; fi; %configure --disable-static --includedir="%_includedir/%name" \ - --docdir="%_defaultdocdir/%name" + --docdir="%_defaultdocdir/%name" --disable-documentation make %{?_smp_mflags} V=1 %install @@ -168,10 +164,5 @@ fi %_datadir/aclocal/ #%_datadir/pkgconfig/wayland-*.pc %_datadir/wayland/ -%_mandir/man3/wl_*.3* - -%files doc -%defattr(-,root,root) -%_docdir/wayland/ %changelog From bd8176212e15fa67d2e5483add2e1ed5d42333b893f83146b534565798f8c24d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 4 Feb 2015 15:04:55 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=57 --- wayland.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/wayland.spec b/wayland.spec index f96091e..e19a6e6 100644 --- a/wayland.spec +++ b/wayland.spec @@ -39,6 +39,10 @@ BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libffi) +%define with_doc 0 +%if 0%with_doc +BuildRequires: doxygen graphviz-gnome xmlto +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -117,8 +121,12 @@ if [ ! -e configure ]; then autoreconf -fi; fi; %configure --disable-static --includedir="%_includedir/%name" \ - --docdir="%_defaultdocdir/%name" --disable-documentation -make %{?_smp_mflags} V=1 +%if %with_doc + --docdir="%_defaultdocdir/%name" +%else + --disable-documentation +%endif +make %{?_smp_mflags} %install make DESTDIR="%buildroot" install %{?_smp_mflags} @@ -165,4 +173,11 @@ fi #%_datadir/pkgconfig/wayland-*.pc %_datadir/wayland/ +%if %with_doc +%files doc +%defattr(-,root,root) +%_mandir/man3/wl*.3* +%_docdir/%name/ +%endif + %changelog