diff --git a/libquicktime.changes b/libquicktime.changes index e8819e7..99544f3 100644 --- a/libquicktime.changes +++ b/libquicktime.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jul 17 12:41:45 CEST 2008 - puzel@suse.cz + +- specfile fixes + * use configure macro + * fix htmldir location + * use %fdupes only on suse > 10.2 + ------------------------------------------------------------------- Tue Jul 15 11:06:56 CEST 2008 - puzel@suse.cz diff --git a/libquicktime.spec b/libquicktime.spec index befe12d..1ddcdb6 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -12,13 +12,16 @@ Name: libquicktime -BuildRequires: alsa-devel doxygen fdupes gtk2-devel libavc1394-devel libdv-devel libjpeg-devel libvorbis-devel sed +BuildRequires: alsa-devel doxygen gtk2-devel libavc1394-devel libdv-devel libjpeg-devel libvorbis-devel sed +%if %suse_version > 1020 +BuildRequires: fdupes +%endif %define DISTRIBUTABLE 1 -License: GPL v2 or later +License: LGPL v2.1 or later Group: Development/Libraries/Other AutoReqProv: on Version: 1.0.3 -Release: 1 +Release: 3 Url: http://libquicktime.sf.net Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-%{version}-dont_disable_deprecated.patch @@ -57,22 +60,18 @@ sed -r 's/"(building|codecs|index|license|opening|positioning|reading|util|writi %build autoreconf -f -i %{?suse_update_config:%{suse_update_config -f}} -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --docdir=%{_docdir}/%{name}-devel \ - --enable-gpl \ +%configure \ + --docdir=%{_defaultdocdir}/%{name}-devel \ + --htmldir=%{_defaultdocdir}/%{name}-devel/html \ + --enable-gpl \ %if %DISTRIBUTABLE - --without-faac \ - --without-faad2 \ - --without-ffmpeg \ - --without-lame \ - --without-x264 \ + --without-faac \ + --without-faad2 \ + --without-ffmpeg \ + --without-lame \ + --without-x264 \ %endif - --disable-static \ - --htmldir=%{_prefix}/html + --disable-static make %install @@ -111,10 +110,14 @@ rm -rf "%{buildroot}" %{_libdir}/lib*.so %{_libdir}/pkgconfig/libquicktime.pc %{_datadir}/aclocal/lqt.m4 -#%#doc doc/*.html doc/*.txt -%doc %{_docdir}/%{name}-devel +%doc %{_defaultdocdir}/%{name}-devel %changelog +* Thu Jul 17 2008 puzel@suse.cz +- specfile fixes + * use configure macro + * fix htmldir location + * use %%fdupes only on suse > 10.2 * Tue Jul 15 2008 puzel@suse.cz - update to 1.0.3 * dnxhd decoding support