Skip to content

Commit

Permalink
Merge branch 'update_1_20' into 'master'
Browse files Browse the repository at this point in the history
[wayland-protocols] Update to version 1.20. JB#51324

See merge request mer-core/wayland-protocols!2
  • Loading branch information
mlehtima committed Oct 9, 2020
2 parents e1df88c + bce1b5e commit 70b8e98
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "wayland-protocols"]
path = wayland-protocols
url = https://git.merproject.org/mirror/wayland-protocols.git
url = https://git.sailfishos.org/mirror/wayland-protocols.git
13 changes: 6 additions & 7 deletions rpm/wayland-protocols.spec
@@ -1,12 +1,12 @@
Name: wayland-protocols

Summary: Wayland protocols that adds functionality not available in the core protocol
Version: 1.17.0
Version: 1.20.0
Release: 1
Group: System/Libraries
License: MIT
URL: http://wayland.freedesktop.org/
Source0: wayland-protocols-%{version}.tar.xz
BuildArch: noarch
BuildRequires: pkgconfig(wayland-scanner)

%description
Expand All @@ -18,7 +18,6 @@ wayland-protocols.

%package devel
Summary: Wayland protocols that adds functionality not available in the core protocol
Group: Development/Libraries/C and C++

%description devel
This package contains Wayland protocols that adds functionality not
Expand All @@ -28,18 +27,18 @@ protocol either in Wayland core, or some other protocol in
wayland-protocols.

%prep
%setup -q -n %{name}-%{version}/wayland-protocols
%autosetup -n %{name}-%{version}/wayland-protocols

%build
%reconfigure
make %{?_smp_mflags}
%make_build

%install
rm -rf %{buildroot}
%make_install

%files devel
%defattr(-,root,root,-)
%doc README COPYING
%license COPYING
%doc README.md
%{_datadir}/pkgconfig/%{name}.pc
%{_datadir}/%{name}/
2 changes: 1 addition & 1 deletion wayland-protocols
Submodule wayland-protocols updated from 9132fc to b0a25f

0 comments on commit 70b8e98

Please sign in to comment.