SPECS (DEVEL): quicktime4linux.spec - -devel, -static Obsoletes: li...

[qboosh]

Author: qboosh                       Date: Wed Oct 26 19:43:07 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- -devel,-static Obsoletes: libquicktime-* for easy switching

---- Files affected:
SPECS:
   quicktime4linux.spec (1.59.2.3 -> 1.59.2.4) 

---- Diffs:

================================================================
Index: SPECS/quicktime4linux.spec
diff -u SPECS/quicktime4linux.spec:1.59.2.3 SPECS/quicktime4linux.spec:1.59.2.4
--- SPECS/quicktime4linux.spec:1.59.2.3	Mon Oct 24 19:33:21 2005
+++ SPECS/quicktime4linux.spec	Wed Oct 26 21:43:02 2005
@@ -61,6 +61,7 @@
 Requires:	libpng-devel >= 1.0.8
 Requires:	libvorbis-devel >= 1:1.1.1
 Requires:	libx264-devel >= 0.1.2-1.20050714
+Obsoletes:	libquicktime-devel
 
 %description devel
 Header files and development documentation for quicktime4linux.
@@ -68,23 +69,12 @@
 %description devel -l pl
 Pliki nagłówkowe i dokumentacja do biblioteki quicktime4linux.
 
-%package progs
-Summary:	Useful tools to operate at Quicktime files
-Summary(pl):	Pożyteczne narzędzia od operowania na plikach w formacie Quicktime
-Group:		Applications/Multimedia
-Requires:	%{name} = %{version}-%{release}
-
-%description progs
-Useful tools to operate at Quicktime files.
-
-%description progs -l pl
-Pożyteczne narzędzia od operowania na plikach w formacie Quicktime.
-
 %package static
 Summary:	Static quicktime4linux libraries
 Summary(pl):	Biblioteki statyczne quicktime4linux
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Obsoletes:	libquicktime-static
 
 %description static
 Static quicktime4linux libraries.
@@ -92,6 +82,18 @@
 %description static -l pl
 Biblioteki statyczne quicktime4linux.
 
+%package progs
+Summary:	Useful tools to operate at Quicktime files
+Summary(pl):	Pożyteczne narzędzia od operowania na plikach w formacie Quicktime
+Group:		Applications/Multimedia
+Requires:	%{name} = %{version}-%{release}
+
+%description progs
+Useful tools to operate at Quicktime files.
+
+%description progs -l pl
+Pożyteczne narzędzia od operowania na plikach w formacie Quicktime.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -128,10 +130,6 @@
 %doc README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
-%files progs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-
 %files devel
 %defattr(644,root,root,755)
 %doc docs/*.html
@@ -143,12 +141,19 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
+%files progs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59.2.4  2005/10/26 19:43:02  qboosh
+- -devel,-static Obsoletes: libquicktime-* for easy switching
+
 Revision 1.59.2.3  2005/10/24 17:33:21  qboosh
 - updated acam patch, now builds with DEVEL ffmpeg/libx264
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/quicktime4linux.spec?r1=1.59.2.3&r2=1.59.2.4&f=u