From 08ed56cf6aa070ec5c2ddec0aacbfb7b83178e7abf3f408a6d7ca0a1e1e01c39 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 21 Jun 2019 10:12:47 +0000 Subject: [PATCH 1/2] - xorgproto 2019.1 * This release boasts a bunch of cleanup work and a few new keysyms. No functional changes to any of the protocols. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorgproto?expand=0&rev=4 --- xorgproto-2018.4.tar.bz2 | 3 --- xorgproto-2019.1.tar.bz2 | 3 +++ xorgproto.changes | 7 +++++++ xorgproto.spec | 11 ++++------- 4 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 xorgproto-2018.4.tar.bz2 create mode 100644 xorgproto-2019.1.tar.bz2 diff --git a/xorgproto-2018.4.tar.bz2 b/xorgproto-2018.4.tar.bz2 deleted file mode 100644 index fb914d0..0000000 --- a/xorgproto-2018.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0 -size 390293 diff --git a/xorgproto-2019.1.tar.bz2 b/xorgproto-2019.1.tar.bz2 new file mode 100644 index 0000000..eca9839 --- /dev/null +++ b/xorgproto-2019.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6daaa7a6cbc8e374032d83ff7f47d41be98f1e0f4475d66a4da3aa766a0d49b +size 865840 diff --git a/xorgproto.changes b/xorgproto.changes index 6ed80d1..9279364 100644 --- a/xorgproto.changes +++ b/xorgproto.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 21 10:08:56 UTC 2019 - Stefan Dirsch + +- xorgproto 2019.1 + * This release boasts a bunch of cleanup work and a few new + keysyms. No functional changes to any of the protocols. + ------------------------------------------------------------------- Wed Jun 27 23:07:34 UTC 2018 - tobias.johannes.klausmann@mni.thm.de diff --git a/xorgproto.spec b/xorgproto.spec index 72e847a..b0449f9 100644 --- a/xorgproto.spec +++ b/xorgproto.spec @@ -1,7 +1,7 @@ # # spec file for package xorgproto # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: xorgproto -Version: 2018.4 +Version: 2019.1 Release: 0 Url: http://xorg.freedesktop.org/ Summary: The X11 Protocol collection @@ -30,9 +30,6 @@ Source: http://xorg.freedesktop.org/releases/individual/proto/%name-%ver BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build - - - %description The X11 protocol headers for X11 development. This package contains all previously split protocol packages: @@ -49,7 +46,6 @@ Group: Development/Libraries/X11 Obsoletes: xorgproto-devel < %{version} # the next is for obsoleting applewmproto <= 1.4.2 -Obsoletes: xorg-x11-proto-devel Obsoletes: bigreqsproto-devel <= 1.1.2 Obsoletes: compositeproto-devel <= 0.4.2 Obsoletes: damageproto-devel <= 1.2.1 @@ -78,6 +74,7 @@ Obsoletes: xf86driproto-devel <= 2.1.1 Obsoletes: xf86miscproto-devel <= 0.9.3 Obsoletes: xf86vidmodeproto-devel <= 2.3.1 Obsoletes: xineramaproto-devel <= 1.2.1 +Obsoletes: xorg-x11-proto-devel Obsoletes: xproto-devel <= 7.0.32 Obsoletes: xproxymngproto-devel <= 1.0.3 From 757d2ef041e10f1c8ab8d61cb16bffc501a49bfb1c085fad8d7ad74ca87aa984 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 24 Jun 2019 14:49:28 +0000 Subject: [PATCH 2/2] - use --enable-legacy configure option on existing products in order not to break package builds, which still requires any of these extensions: * trapproto * xf86miscproto * xproxymngproto deleterequests for the affected packaages have been done for factory/TW OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorgproto?expand=0&rev=5 --- xorgproto.changes | 11 +++++++++++ xorgproto.spec | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/xorgproto.changes b/xorgproto.changes index 9279364..d0b6d39 100644 --- a/xorgproto.changes +++ b/xorgproto.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 24 14:28:53 UTC 2019 - Stefan Dirsch + +- use --enable-legacy configure option on existing products in order + not to break package builds, which still requires any of these + extensions: + * trapproto + * xf86miscproto + * xproxymngproto + deleterequests for the affected packaages have been done for factory/TW + ------------------------------------------------------------------- Fri Jun 21 10:08:56 UTC 2019 - Stefan Dirsch diff --git a/xorgproto.spec b/xorgproto.spec index b0449f9..45a68ba 100644 --- a/xorgproto.spec +++ b/xorgproto.spec @@ -93,11 +93,19 @@ xproto and xproxymngproto. %build #autoreconf -fi +%if (0%{?suse_version} < 1550) +%configure --enable-legacy +%else %configure +%endif make %{?_smp_mflags} %install make install DESTDIR="%buildroot" +%if (0%{?suse_version} < 1550) +# we seriously don't want to package that again ... +rm %{buildroot}%{_mandir}/man7/Xprint.7 +%endif %files devel %defattr(-,root,root)