revert that stupid conflicts

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=105
This commit is contained in:
Stephan Kulow 2013-06-10 10:36:29 +00:00 committed by Git OBS Bridge
parent 10c6349ee3
commit 4fe0d67be0
2 changed files with 0 additions and 8 deletions

View File

@ -5,11 +5,6 @@ Sat Jun 8 08:41:55 UTC 2013 - schwab@suse.de
- Reenable mpi on aarch64 - Reenable mpi on aarch64
- Avoid duplication between %build and %install - Avoid duplication between %build and %install
-------------------------------------------------------------------
Wed May 29 11:48:57 UTC 2013 - varkoly@suse.com
- Conflicts with man-pages
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 3 14:20:58 CEST 2013 - pth@suse.de Wed Apr 3 14:20:58 CEST 2013 - pth@suse.de

View File

@ -181,9 +181,6 @@ Group: Development/Libraries/C and C++
%if 0%{?suse_version} >= 1120 %if 0%{?suse_version} >= 1120
BuildArch: noarch BuildArch: noarch
%endif %endif
%if 0%{?suse_version} >= 1230
Conflicts: man-pages
%endif
%description doc-man %description doc-man
This package contains the documentation of the boost dynamic libraries This package contains the documentation of the boost dynamic libraries