Merge branch 'master' into f13

Conflicts:
	.gitignore
	schroedinger.spec
	sources

Signed-off-by: Fabian Deutsch <fabian.deutsch@gmx.de>

.gitignore

@@ -1 +1,2 @@
 schroedinger-1.0.9.tar.gz
+/schroedinger-1.0.10.tar.gz

schroedinger-no-testsuite.patch

@@ -1,15 +0,0 @@
-diff -u schroedinger-1.0.9/Makefile.in schroedinger-1.0.9.b/Makefile.in
---- schroedinger-1.0.9/Makefile.in	2010-03-04 10:04:43.000000000 +0100
-+++ schroedinger-1.0.9.b/Makefile.in	2010-03-05 20:47:06.000000000 +0100
-@@ -290,9 +290,9 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = schroedinger doc tools testsuite
-+SUBDIRS = schroedinger doc tools
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--DIST_SUBDIRS = schroedinger doc tools testsuite
-+DIST_SUBDIRS = schroedinger doc tools
- EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL COPYING.MIT COPYING.MPL \
- 	     autogen.sh schroedinger.spec TODO NEWS
- 

schroedinger.spec

@@ -1,22 +1,20 @@
 %define abi 1.0
 
 Name:           schroedinger
-Version:        1.0.9
+Version:        1.0.10
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Portable libraries for the high quality Dirac video codec
 
 Group:          System Environment/Libraries
 # No version is given for the GPL or the LGPL
 License:        GPL+ or LGPLv2+ or MIT or MPLv1.1
 URL:            http://www.diracvideo.org/
-Source0:	http://www.diracvideo.org/download/schroedinger/schroedinger-%{version}.tar.gz
+Source0:        http://www.diracvideo.org/download/schroedinger/schroedinger-%{version}.tar.gz
-# Issue is known upstream, fixed in git and so fixed in NEXT_RELEASE
-Patch0:		%{name}-no-testsuite.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	orc-devel >= 0.4.3
+BuildRequires:  orc-devel >= 0.4.10
 BuildRequires:  glew-devel >= 1.5.1
-BuildRequires:	gtk-doc
+BuildRequires:  gtk-doc
 
 
 %description
@@ -34,7 +32,7 @@ Group:          Development/Libraries
 Summary:        Development files for schroedinger
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
-Requires:	orc-devel >= 0.4.3
+Requires:       orc-devel >= 0.4.10
 
 %description devel
 Development files for schroedinger
@@ -42,7 +40,7 @@ Development files for schroedinger
 
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 %configure --disable-static --enable-gtk-doc
@@ -53,23 +51,29 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 find %{buildroot} -name \*.la -delete
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING* NEWS TODO
 %{_libdir}/libschroedinger-%{abi}.so.*
 
+
 %files devel
 %defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/html/schroedinger
@@ -79,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 24 2010 Fabian Deutsch <fabiand@fedoraproject.org> - 1.0.10-1
+- Update to 1.0.10
+
 * Tue Apr 22 2010 Fabian Deutsch <fabiand@fedoraproject.org> - 1.0.9-2
 - Added dependency on gtk-doc
 

sources

@@ -1 +1 @@
-d67ec48b7c506db8c8b49156bf409e60  schroedinger-1.0.9.tar.gz
+9de088ccc314bb9e766cb3aa6510a0ef  schroedinger-1.0.10.tar.gz