Avoid conflict with perl-Parse-Yapp

Both install %{perl_vendorlib}/Parse/Yapp/Driver.pm so we exclude the
directory and the one particular file to catch potential more installs
later too

This is a follow up to
Cleanup and enhance the pidl sub package.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=511
This commit is contained in:
Lars Müller 2015-11-20 10:48:38 +00:00 committed by Git OBS Bridge
parent f9ec733ab4
commit 4830ba27c9
3 changed files with 8 additions and 7 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a8ca8635a788d7408600ec1fdcefddb78a22e47e30e76d1526561585594b7a7
size 29343
oid sha256:60c016eaf0856d6a5a6c3f52b4e6814e8baf79d91a023db4d66e3c01909ac581
size 29381

View File

@ -144,7 +144,7 @@ BuildRequires: systemd-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3523
%define SOURCE_TIMESTAMP 3531
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
@ -2005,13 +2005,14 @@ fi
%defattr(-,root,root)
%dir %{perl_vendorlib}/Parse
%dir %{perl_vendorlib}/Parse/Pidl
%dir %{perl_vendorlib}/Parse/Yapp
%{perl_vendorlib}/Parse/Pidl.pm*
%{perl_vendorlib}/Parse/Pidl/*
%{perl_vendorlib}/Parse/Yapp/*
%{_mandir}/man1/pidl.1.*
%{_mandir}/man3/Parse::Pidl::*.3pm.*
%{_bindir}/pidl
# both are part of perl-Parse-Yapp
%exclude %dir %{perl_vendorlib}/Parse/Yapp
%exclude %{perl_vendorlib}/Parse/Yapp/Driver.pm
%files python
%defattr(-,root,root)

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3219007fcf5801f63f6c8627edd44b862b12776ad795a6b60e74df41d517635a
size 52993
oid sha256:afd8855af366d573c48cd86a19c7f963d9716033412db6515bec24d2f8c89ea9
size 52904