Accepting request 348367 from home:scarabeus_iv:branches:multimedia:libs

- Use ffmpeg even in OBS with reduced scope of course
- Cleanup with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/348367
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=58

libquicktime.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 11 11:04:37 UTC 2015 - tchvatal@suse.com
+
+- Use ffmpeg even in OBS with reduced scope of course
+- Cleanup with spec-cleaner
+
 -------------------------------------------------------------------
 Tue Sep 22 08:47:31 UTC 2015 - olaf@aepfle.de
 

libquicktime.spec

@@ -18,7 +18,6 @@
 
 %define soname 0
 %define cvs  20150223
-
 Name:           libquicktime
 Version:        1.2.4cvs%{cvs}
 Release:        0
@@ -42,28 +41,26 @@ BuildRequires:  libvorbis-devel
 BuildRequires:  pkg-config
 BuildRequires:  schroedinger-devel
 BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xaw7)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xv)
-
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?BUILD_ORIG}
 BuildRequires:  libfaac-devel
 BuildRequires:  libfaad2-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libx264-devel
-BuildRequires:  pkgconfig(libavcodec)
-BuildRequires:  pkgconfig(libswscale)
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 A library for reading and writing Quicktime movie files, based on and
 forked from quicktime4linux.
 
 %package -n %{name}%{soname}
-
 Summary:        Library for Reading and Writing Quicktime Movie Files
 Group:          System/Libraries
 # Last version with this name was openSUSE 11.4
@@ -75,7 +72,6 @@ A library for reading and writing Quicktime movie files, based on and
 forked from quicktime4linux.
 
 %package -n libquicktime-devel
-
 Summary:        Library for reading/writing quicktime movie files
 Group:          Development/Libraries/C and C++
 Requires:       %{name}%{soname} = %{version}
@@ -85,7 +81,6 @@ library for reading/writing quicktime movie files, based on and forked
 from quicktime4linux
 
 %package -n libquicktime-tools
-
 Summary:        Libquicktime Tools
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Requires:       %{name}%{soname} = %{version}
@@ -99,7 +94,7 @@ Tools for reading/writing quicktime movie files.
 sed -i 's/-DGTK_DISABLE_DEPRECATED//g' configure.ac
 
 # Replace licence with wrong FSF address
-cp -v %{S:1} .
+cp -v %{SOURCE1} .
 
 %build
 echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in
@@ -112,13 +107,10 @@ echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in
 make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 ln -s lqt "%{buildroot}%{_includedir}/quicktime"
 %find_lang libquicktime
-find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
-
-%clean
-%{?buildroot:rm -rf %{buildroot}}
 
 %post   -n libquicktime%{soname} -p /sbin/ldconfig
 
@@ -138,10 +130,10 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
 %{_libdir}/libquicktime/lqt_schroedinger.so
 %{_libdir}/libquicktime/lqt_videocodec.so
 %{_libdir}/libquicktime/lqt_vorbis.so
+%{_libdir}/libquicktime/lqt_ffmpeg.so
 %if 0%{?BUILD_ORIG}
 %{_libdir}/libquicktime/lqt_faac.so
 %{_libdir}/libquicktime/lqt_faad2.so
-%{_libdir}/libquicktime/lqt_ffmpeg.so
 %{_libdir}/libquicktime/lqt_lame.so
 %{_libdir}/libquicktime/lqt_x264.so
 %endif
@@ -167,6 +159,6 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
 %{_bindir}/qtrechunk
 %{_bindir}/qtstreamize
 %{_bindir}/qtyuv4toyuv
-%doc %{_mandir}/man1/lqtplay.1%{ext_man}
+%{_mandir}/man1/lqtplay.1%{ext_man}
 
 %changelog