Accepting request 40589 from multimedia:libs

checked in (request 40589)

OBS-URL: https://build.opensuse.org/request/show/40589
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=18

dirac.spec

@@ -24,10 +24,9 @@ Release:        4
 Url:            http://diracvideo.org/
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 License:        MPL ..
-Summary:        The Dirac_Video Codec
+Summary:        The dirac Video Codec
 Source:         %{name}-%{version}.tar.bz2
-Patch0:         0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch
-Patch1:         %{name}-%{version}-gcc45.patch
+Patch0:         %{name}-%{version}-gcc45.patch
 BuildRequires:  gcc-c++ libstdc++-devel
 BuildRequires:  libcppunit-devel
 %ifnarch ia64 s390 s390x %sparc
@@ -167,11 +166,8 @@ Authors:
 License:        MPL ..
 Group:          Development/Libraries/C and C++
 Summary:        Development Files for Dirac Video Codec
-AutoReqProv:    on
 Requires:       libdirac_decoder0 = %{version}
 Requires:       libdirac_encoder0 = %{version}
-Provides:       libdirac-devel = %{version}-%{release}
-Obsoletes:      libdirac-devel < %{version}-%{release}
 
 %description devel
 Dirac is an open source video codec. It uses a traditional hybrid video
@@ -212,22 +208,9 @@ Authors:
     Peter Bleackley <diracinfo@rd.bbc.co.uk>, BBC Research and Development
     Myo Tun <myo.tun@brunel.ac.uk>, Brunel University
 
-%package doc
-License:        MPL ..
-Group:          Documentation/HTML
-Summary:        Dirac Video Codec api documentation
-%if 0%{?suse_version} > 1110
-BuildArch:      noarch
-%endif
-
-%description doc
-This package provides the api reference documentation for using dirac libraries
-in your program.
-
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 # Code is not mature enough for -Werror (unused results)
 sed -i 's/-Werror//' configure.ac
 
@@ -241,10 +224,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0"
 %endif
 %endif
 %configure\
-	--disable-static \
-	--docdir=%{_docdir}/packages/%{name}
-%{__make} %{?jobs:-j%jobs}
-#htmldir=%{_docdir}/%{name}/code/api_html
+	--disable-static
+%{__make} %{?jobs:-j%jobs} htmldir=%{_docdir}/%{name}/code/api_html
 
 %install
 %makeinstall htmldir=%{_docdir}/%{name}/code/api_html
@@ -265,8 +246,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0"
 
 %files
 %defattr (-, root, root)
-#%%doc AUTHORS COPYING ChangeLog NEWS README TODO
-#%%doc %{_docdir}/%{name}/[ACNRT]*
+%doc %dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/[ACNRT]*
 %{_bindir}/*
 
 %files -n libdirac_decoder0
@@ -279,15 +260,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O0"
 
 %files devel
 %defattr (-, root, root)
-#%%doc %{_docdir}/%{name}/[ACNRT]*
+%doc %{_docdir}/%{name}/code
 %{_libdir}/*.so
 #%{_libdir}/*.*a
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/%{name}
-
-%files doc
-%defattr (-, root, root)
-%doc %{_docdir}/%{name}
-
+%{_includedir}/dirac
 
 %changelog