Accepting request 896382 from home:dirkmueller:Factory

- package licenses as %%license 
- modernize spec file
- list files in files-section to avoid directory permission
  conflict with filesystem package

OBS-URL: https://build.opensuse.org/request/show/896382
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorgproto?expand=0&rev=17
This commit is contained in:
Stefan Dirsch 2021-05-31 17:44:34 +00:00 committed by Git OBS Bridge
parent df40f95b09
commit 794c5ea0b3
2 changed files with 26 additions and 18 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon May 31 15:07:17 UTC 2021 - Dirk Müller <dmueller@suse.com>
- package licenses as %%license
- modernize spec file
- list files in files-section to avoid directory permission
conflict with filesystem package
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 30 09:04:25 UTC 2021 - Stefan Dirsch <sndirsch@suse.com> Fri Apr 30 09:04:25 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -19,31 +19,28 @@
Name: xorgproto Name: xorgproto
Version: 2021.4 Version: 2021.4
Release: 0 Release: 0
URL: http://xorg.freedesktop.org/
Summary: The X11 Protocol collection Summary: The X11 Protocol collection
License: MIT License: MIT
Group: Development/Libraries/X11 Group: Development/Libraries/X11
URL: https://xorg.freedesktop.org/
#Git-Clone: git://anongit.freedesktop.org/xorg/proto/xorgproto #Git-Clone: git://anongit.freedesktop.org/xorg/proto/xorgproto
#Git-Web: http://cgit.freedesktop.org/xorg/proto/xorgproto/ #Git-Web: http://cgit.freedesktop.org/xorg/proto/xorgproto/
Source: http://xorg.freedesktop.org/releases/individual/proto/%name-%version.tar.bz2 Source: https://xorg.freedesktop.org/releases/individual/proto/%{name}-%{version}.tar.bz2
BuildRequires: pkg-config BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
The X11 protocol headers for X11 development. The X11 protocol headers for X11 development.
This package contains all previously split protocol packages: This package contains all previously split protocol packages:
applewmproto, bigreqsproto, compositeproto, damageproto, dmxproto, dri2proto, applewmproto, bigreqsproto, compositeproto, damageproto, dmxproto, dri2proto,
dri3proto, fixesproto, fontsproto, glproto, inputproto, kbproto, presentproto, dri3proto, fixesproto, fontsproto, glproto, inputproto, kbproto, presentproto,
randrproto, recordproto, renderproto, resourceproto, scrnsaverproto, trapproto, randrproto, recordproto, renderproto, resourceproto, scrnsaverproto, trapproto,
videoproto, windowswmproto, xcmiscproto, xextproto, xf86bigfontproto, videoproto, windowswmproto, xcmiscproto, xextproto, xf86bigfontproto,
xf86dgaproto, xf86driproto, xf86miscproto, xf86vidmodeproto, xineramaproto, xf86dgaproto, xf86driproto, xf86miscproto, xf86vidmodeproto, xineramaproto,
xproto and xproxymngproto. xproto and xproxymngproto.
%package devel %package devel
Summary: The X11 Protocol collection Summary: The X11 Protocol collection
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Obsoletes: xorgproto-devel < %{version} Obsoletes: xorgproto-devel < %{version}
# the next is for obsoleting applewmproto <= 1.4.2 # the next is for obsoleting applewmproto <= 1.4.2
Obsoletes: bigreqsproto-devel <= 1.1.2 Obsoletes: bigreqsproto-devel <= 1.1.2
@ -82,10 +79,10 @@ Obsoletes: xproxymngproto-devel <= 1.0.3
The compelte X11 protocol headers for X11 development. The compelte X11 protocol headers for X11 development.
This package contains all previously split protocol packages: This package contains all previously split protocol packages:
applewmproto, bigreqsproto, compositeproto, damageproto, dmxproto, dri2proto, applewmproto, bigreqsproto, compositeproto, damageproto, dmxproto, dri2proto,
dri3proto, fixesproto, fontsproto, glproto, inputproto, kbproto, presentproto, dri3proto, fixesproto, fontsproto, glproto, inputproto, kbproto, presentproto,
randrproto, recordproto, renderproto, resourceproto, scrnsaverproto, trapproto, randrproto, recordproto, renderproto, resourceproto, scrnsaverproto, trapproto,
videoproto, windowswmproto, xcmiscproto, xextproto, xf86bigfontproto, videoproto, windowswmproto, xcmiscproto, xextproto, xf86bigfontproto,
xf86dgaproto, xf86driproto, xf86miscproto, xf86vidmodeproto, xineramaproto, xf86dgaproto, xf86driproto, xf86miscproto, xf86vidmodeproto, xineramaproto,
xproto and xproxymngproto. xproto and xproxymngproto.
%prep %prep
@ -98,20 +95,23 @@ xproto and xproxymngproto.
%else %else
%configure %configure
%endif %endif
make %{?_smp_mflags} %make_build
%install %install
make install DESTDIR="%buildroot" %make_install
%if (0%{?suse_version} < 1550) %if (0%{?suse_version} < 1550)
# we seriously don't want to package that again ... # we seriously don't want to package that again ...
rm %{buildroot}%{_mandir}/man7/Xprint.7 rm %{buildroot}%{_mandir}/man7/Xprint.7
%endif %endif
%files devel %files devel
%defattr(-,root,root) %license COPYING-*
%doc %_datadir/doc/* %doc %{_datadir}/doc/*
%_includedir/X11/ %dir %{_includedir}/GL
%_includedir/GL/ %{_includedir}/GL/*.h
%{_includedir}/GL/internal
%{_includedir}/X11/{dri,extensions,fonts}
%{_includedir}/X11/*.h
%{_datarootdir}/pkgconfig/*.pc %{_datarootdir}/pkgconfig/*.pc
%changelog %changelog