rpms/libtheora/devel libtheora.spec,1.21,1.22

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/libtheora/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18446

Modified Files:
	libtheora.spec 
Log Message:
* Wed Oct 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0beta2-2
- Put Obsoletes/Provides theora-exp-devel in the -devel package instead of in
  the -tools package (oops)
- Install png2theora (bz 349951)



Index: libtheora.spec
===================================================================
RCS file: /cvs/extras/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libtheora.spec	18 Oct 2007 14:19:40 -0000	1.21
+++ libtheora.spec	24 Oct 2007 08:36:49 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0beta2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
@@ -11,7 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: libogg-devel >= 2:1.1
 BuildRequires: libvorbis-devel
-BuildRequires: SDL-devel
+BuildRequires: SDL-devel libpng-devel
 BuildRequires: doxygen
 BuildRequires: tetex-latex transfig
 
@@ -23,42 +23,46 @@
 bitstream headers, but Theora will make use of this extra freedom
 in the future to improve over what is possible with VP3.
 
+
 %package devel
 Summary: Development tools for Theora applications
 Group: Development/Libraries
 Requires:	libogg-devel >= 2:1.1
 Requires:	libtheora = %{epoch}:%{version}-%{release}
 Requires:	pkgconfig
+# the new experimental decoder is now part of the regular libtheora
+# we do not obsolete theora-exp itself as that had a different soname and we
+# do not want to break deps, however we do now provide the same headers as
+# theora-exp-devel did.
+Obsoletes:	theora-exp-devel
+Provides:	theora-exp-devel
 
 %description devel
 The libtheora-devel package contains the header files and documentation 
 needed to develop applications with libtheora.
 
+
 %package -n theora-tools
 Summary: Command line tools for Theora videos
 Group: Applications/Multimedia
 Requires: libtheora = %{epoch}:%{version}-%{release}
-Requires: pkgconfig
-# the new experimental decoder is now part of the regular libtheora
-# we do not obsolete theora-exp itself as that had a different soname and we
-# do not want to break deps, however we do now provide the same headers as
-# theora-exp-devel did.
-Obsoletes: theora-exp-devel
-Provides: theora-exp-devel
 
 %description -n theora-tools
 The theora-tools package contains simple command line tools for use 
 with theora bitstreams.
 
+
 %prep
 %setup -q
 %patch1 -p1
 
+
 %build
 %configure --enable-shared --disable-static
 make
 make -C doc/spec
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
@@ -70,14 +74,18 @@
 install -m 755 examples/.libs/dump_video $RPM_BUILD_ROOT/%{_bindir}/theora_dump_video
 install -m 755 examples/.libs/encoder_example $RPM_BUILD_ROOT/%{_bindir}/theora_encode
 install -m 755 examples/.libs/player_example $RPM_BUILD_ROOT/%{_bindir}/theora_player
+install -m 755 examples/.libs/png2theora $RPM_BUILD_ROOT/%{_bindir}/png2theora
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc README COPYING 
@@ -95,7 +103,13 @@
 %defattr(-,root,root,-)
 %{_bindir}/*
 
+
 %changelog
+* Wed Oct 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0beta2-2
+- Put Obsoletes/Provides theora-exp-devel in the -devel package instead of in
+  the -tools package (oops)
+- Install png2theora (bz 349951)
+
 * Thu Oct 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0beta2-1
 - New upstream bugfix release 1.0beta2