From afd829c5b3155a8f909a76ddd1c8b891b9c9e5ebf97d8f270dca5f8064c1a75e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 21 Sep 2016 05:52:14 +0000
Subject: [PATCH] weston-1.12

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=58
---
 ...ults-obtained-by-pkg-config-libinput.patch |  10 ++---
 weston-1.11.0.tar.xz                          |   3 --
 weston-1.11.0.tar.xz.sig                      | Bin 72 -> 0 bytes
 weston-1.12.0.tar.xz                          |   3 ++
 weston-1.12.0.tar.xz.sig                      | Bin 0 -> 72 bytes
 weston.changes                                |   6 +++
 weston.spec                                   |  41 +++++++++++++++++-
 7 files changed, 53 insertions(+), 10 deletions(-)
 delete mode 100644 weston-1.11.0.tar.xz
 delete mode 100644 weston-1.11.0.tar.xz.sig
 create mode 100644 weston-1.12.0.tar.xz
 create mode 100644 weston-1.12.0.tar.xz.sig

diff --git a/0001-build-honor-results-obtained-by-pkg-config-libinput.patch b/0001-build-honor-results-obtained-by-pkg-config-libinput.patch
index 73dc278..479194c 100644
--- a/0001-build-honor-results-obtained-by-pkg-config-libinput.patch
+++ b/0001-build-honor-results-obtained-by-pkg-config-libinput.patch
@@ -9,13 +9,13 @@ src/libinput-seat.c:30:22: fatal error: libinput.h: No such file or directory
  Makefile.am |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: weston-1.8.0/Makefile.am
+Index: weston-1.12.0/Makefile.am
 ===================================================================
---- weston-1.8.0.orig/Makefile.am
-+++ weston-1.8.0/Makefile.am
-@@ -51,7 +51,8 @@ AM_CPPFLAGS = 					\
+--- weston-1.12.0.orig/Makefile.am
++++ weston-1.12.0/Makefile.am
+@@ -53,7 +53,8 @@ AM_CPPFLAGS = 					\
  	-DDATADIR='"$(datadir)"'		\
- 	-DMODULEDIR='"$(moduledir)"'		\
+ 	-DLIBWESTON_MODULEDIR='"$(libweston_moduledir)"' \
  	-DLIBEXECDIR='"$(libexecdir)"'		\
 -	-DBINDIR='"$(bindir)"'
 +	-DBINDIR='"$(bindir)"' \
diff --git a/weston-1.11.0.tar.xz b/weston-1.11.0.tar.xz
deleted file mode 100644
index 034700d..0000000
--- a/weston-1.11.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125
-size 1242244
diff --git a/weston-1.11.0.tar.xz.sig b/weston-1.11.0.tar.xz.sig
deleted file mode 100644
index f7e2f2c7aac960aeeddcd5126574d5055402e6f6823d9829bfb8ffebfa13aae2..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0#{Bl*8mC$5D}vRR^aA#5o;0vo;ZGsBId2mil4Aals<OG
emv*35p8%gtWNg@+>*A_6p#jdf%+`CxB}WWngdHsa

diff --git a/weston-1.12.0.tar.xz b/weston-1.12.0.tar.xz
new file mode 100644
index 0000000..3911a53
--- /dev/null
+++ b/weston-1.12.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033
+size 1260892
diff --git a/weston-1.12.0.tar.xz.sig b/weston-1.12.0.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..b64f650ec1ac30d267539507cd56464858d82bbf90524c47cff1af631b2aef57
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0$1UUF#rk)5D}vRR^aA#5jwH}pusH>K^10oiYC0tt%ky_
eGL%0TbpW8KTUsQC%x8i><t|u5M*1h99$4QkHX1Gf

literal 0
HcmV?d00001

diff --git a/weston.changes b/weston.changes
index 8d436ec..92690fa 100644
--- a/weston.changes
+++ b/weston.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 21 05:17:56 UTC 2016 - jengelh@inai.de
+
+- Update to new upstream release 1.12.0
+- Drop 0001-build-honor-results-obtained-by-pkg-config-libinput.patch
+
 -------------------------------------------------------------------
 Wed Jun  1 08:32:54 UTC 2016 - jengelh@inai.de
 
diff --git a/weston.spec b/weston.spec
index cd7b240..5c11400 100644
--- a/weston.spec
+++ b/weston.spec
@@ -18,7 +18,7 @@
 
 Name:           weston
 %define lname	libweston0
-Version:        1.11.0
+Version:        1.12.0
 Release:        0
 Summary:        Wayland Reference Compositor
 License:        HPND and CC-BY-SA-3.0
@@ -96,6 +96,25 @@ desktop shell. Finally, weston also provides integration with the
 Xorg server and can pull X clients into the Wayland desktop and act
 as a X window manager.
 
+%package -n libweston-1
+Summary:        Weston backend collection
+Group:          System/Libraries
+
+%description -n libweston-1
+
+%package -n libweston-1-0
+Summary:        The Weston compositor as a shared library
+Group:          System/Libraries
+Requires:       libweston-1 >= %version
+
+%description -n libweston-1-0
+
+%package -n libweston-desktop-1-0
+Summary:        The Weston compositor as a shared library
+Group:          System/Libraries
+
+%description -n libweston-desktop-1-0
+
 %package devel
 Summary:        Development files for Weston plugins
 Group:          Development/Libraries/C and C++
@@ -139,6 +158,11 @@ if ! make BACKEND=headless-backend.so check; then
 fi
 %endif
 
+%post   -n libweston-1-0 -p /sbin/ldconfig
+%postun -n libweston-1-0 -p /sbin/ldconfig
+%post   -n libweston-desktop-1-0 -p /sbin/ldconfig
+%postun -n libweston-desktop-1-0 -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc COPYING README
@@ -149,9 +173,22 @@ fi
 %_datadir/wayland-sessions/
 %_mandir/man?/*.*
 
+%files -n libweston-1-0
+%defattr(-,root,root)
+%_libdir/libweston-1.so.0*
+
+%files -n libweston-1
+%defattr(-,root,root)
+%_libdir/libweston-1/
+
+%files -n libweston-desktop-1-0
+%defattr(-,root,root)
+%_libdir/libweston-desktop-1.so.0*
+
 %files devel
 %defattr(-,root,root)
 %_includedir/%name/
-%_libdir/pkgconfig/%name.pc
+%_libdir/pkgconfig/*.pc
+%_libdir/libweston*.so
 
 %changelog