Accepting request 657577 from home:dimstar:cycle

- Drop graphviz BuildRequires: we lose the doc with this, but
  manage to break a build cycle.

OBS-URL: https://build.opensuse.org/request/show/657577
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libvdpau?expand=0&rev=11
This commit is contained in:
Stefan Dirsch 2018-12-12 15:21:33 +00:00 committed by Git OBS Bridge
parent 93fdfcf3cc
commit ada0e8216c
2 changed files with 14 additions and 13 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 12 14:56:05 UTC 2018 - Dominique Leuenberger <dimstar@opensuse.org>
- Drop graphviz BuildRequires: we lose the doc with this, but
manage to break a build cycle.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 30 09:59:01 UTC 2017 - sndirsch@suse.com Tue May 30 09:59:01 UTC 2017 - sndirsch@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package libvdpau # spec file for package libvdpau
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #
@ -22,7 +22,7 @@ Release: 0
Summary: VDPAU wrapper and trace libraries Summary: VDPAU wrapper and trace libraries
License: MIT License: MIT
Group: System/Libraries Group: System/Libraries
Url: http://www.freedesktop.org/wiki/Software/VDPAU/ URL: http://www.freedesktop.org/wiki/Software/VDPAU/
Source: http://people.freedesktop.org/~aplattner/vdpau/%{name}-%{version}.tar.bz2 Source: http://people.freedesktop.org/~aplattner/vdpau/%{name}-%{version}.tar.bz2
Source1: http://people.freedesktop.org/~aplattner/vdpau/vdpauinfo-1.0.tar.gz Source1: http://people.freedesktop.org/~aplattner/vdpau/vdpauinfo-1.0.tar.gz
Source2: README Source2: README
@ -34,13 +34,11 @@ BuildRequires: automake
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: graphviz
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(dri2proto) BuildRequires: pkgconfig(dri2proto)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xext)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
This package contains the libvdpau wrapper library and the libvdpau_trace This package contains the libvdpau wrapper library and the libvdpau_trace
@ -97,13 +95,13 @@ make %{?_smp_mflags}
rm %{buildroot}%{_libdir}/libvdpau.la rm %{buildroot}%{_libdir}/libvdpau.la
rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.la rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.la
/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}/vdpau /sbin/ldconfig -n %{buildroot}/%{_libdir}/vdpau
rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.so rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.so
pushd ../vdpauinfo-* pushd ../vdpauinfo-*
%configure \ %configure \
VDPAU_CFLAGS=-I$RPM_BUILD_ROOT/usr/include \ VDPAU_CFLAGS=-I%{buildroot}%{_includedir} \
VDPAU_LIBS="-L$RPM_BUILD_ROOT/%{_libdir} -lvdpau -lX11" VDPAU_LIBS="-L%{buildroot}/%{_libdir} -lvdpau -lX11"
make %{?_smp_mflags} make %{?_smp_mflags}
%makeinstall %makeinstall
@ -111,8 +109,6 @@ popd
cp $RPM_SOURCE_DIR/README . cp $RPM_SOURCE_DIR/README .
%fdupes -s $RPM_BUILD_ROOT/%{_datadir}/doc/
%post -n libvdpau1 -p /sbin/ldconfig %post -n libvdpau1 -p /sbin/ldconfig
%postun -n libvdpau1 -p /sbin/ldconfig %postun -n libvdpau1 -p /sbin/ldconfig
@ -120,13 +116,12 @@ cp $RPM_SOURCE_DIR/README .
%files -n libvdpau1 %files -n libvdpau1
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/vdpau %dir %{_libdir}/vdpau
/usr/bin/vdpauinfo %{_bindir}/vdpauinfo
%{_libdir}/libvdpau.so.* %{_libdir}/libvdpau.so.*
%config /etc/vdpau_wrapper.cfg %config %{_sysconfdir}/vdpau_wrapper.cfg
%files -n libvdpau-devel %files -n libvdpau-devel
%defattr(-,root,root) %defattr(-,root,root)
%doc %{_datadir}/doc/%{name}
%dir %{_libdir}/vdpau %dir %{_libdir}/vdpau
%{_includedir}/vdpau %{_includedir}/vdpau
%{_libdir}/libvdpau.so %{_libdir}/libvdpau.so