From 77760f9121193c8341b43127740f9d957aff05bb Mon Sep 17 00:00:00 2001 From: Fabian Deutsch Date: Thu, 22 Apr 2010 12:50:33 +0000 Subject: [PATCH 1/3] Update schroedinger to 1.0.9. --- .cvsignore | 2 +- schroedinger-no-testsuite.patch | 15 +++++++++++++++ schroedinger.spec | 21 ++++++++++++++++----- sources | 2 +- 4 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 schroedinger-no-testsuite.patch diff --git a/.cvsignore b/.cvsignore index bbb34af..57bd9f2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -schroedinger-1.0.8.tar.gz +schroedinger-1.0.9.tar.gz diff --git a/schroedinger-no-testsuite.patch b/schroedinger-no-testsuite.patch new file mode 100644 index 0000000..80cdc56 --- /dev/null +++ b/schroedinger-no-testsuite.patch @@ -0,0 +1,15 @@ +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 + diff --git a/schroedinger.spec b/schroedinger.spec index cec04dd..6f79251 100644 --- a/schroedinger.spec +++ b/schroedinger.spec @@ -1,8 +1,8 @@ %define abi 1.0 Name: schroedinger -Version: 1.0.8 -Release: 4%{?dist} +Version: 1.0.9 +Release: 2%{?dist} Summary: Portable libraries for the high quality Dirac video codec Group: System Environment/Libraries @@ -10,10 +10,13 @@ Group: System Environment/Libraries 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 +# 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: liboil-devel >= 0.3.16 +BuildRequires: orc-devel >= 0.4.3 BuildRequires: glew-devel >= 1.5.1 +BuildRequires: gtk-doc %description @@ -31,7 +34,7 @@ Group: Development/Libraries Summary: Development files for schroedinger Requires: %{name} = %{version}-%{release} Requires: pkgconfig -Requires: liboil-devel >= 0.3.16 +Requires: orc-devel >= 0.4.3 %description devel Development files for schroedinger @@ -39,7 +42,7 @@ Development files for schroedinger %prep %setup -q - +%patch0 -p1 %build %configure --disable-static --enable-gtk-doc @@ -76,6 +79,14 @@ rm -rf %{buildroot} %changelog +* Tue Apr 22 2010 Fabian Deutsch - 1.0.9-2 +- Added dependency on gtk-doc + +* Fri Mar 05 2010 Fabian Deutsch - 1.0.9-1 +- Update to 1.0.9 +- Dropped dependency on liboil +- Added dependency on orc + * Mon Feb 1 2010 Nicolas CHauvet - 1.0.8-4 - Remove gstreamer-plugins-schroedinger Obsoleted by gst-plugins-bad-free introduction in Fedora. diff --git a/sources b/sources index 5bac1a8..fc53a9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a76a7094f80419f81377b63432c64d01 schroedinger-1.0.8.tar.gz +d67ec48b7c506db8c8b49156bf409e60 schroedinger-1.0.9.tar.gz From a0686f54ad53bd8a3e53ca4be1b91a6d9fae4345 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:08:50 +0000 Subject: [PATCH 2/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0ebb7e9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: schroedinger -# $Id: Makefile,v 1.1 2007/06/20 16:44:54 kevin Exp $ -NAME := schroedinger -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 8d0d441..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -schroedinger-1_0_8-3_fc11:HEAD:schroedinger-1.0.8-3.fc11.src.rpm:1256685452 -schroedinger-1_0_8-3_fc11:HEAD:schroedinger-1.0.8-3.fc11.src.rpm:1256685961 From 005506a739b9eccd1563b32f5f4fe1b6aa7a5e88 Mon Sep 17 00:00:00 2001 From: Fabian Deutsch Date: Sun, 24 Oct 2010 11:40:02 +0200 Subject: [PATCH 3/3] Update to 1.0.10. Signed-off-by: Fabian Deutsch --- .gitignore | 1 + schroedinger-no-testsuite.patch | 15 --------------- schroedinger.spec | 25 ++++++++++++++++--------- sources | 2 +- 4 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 schroedinger-no-testsuite.patch diff --git a/.gitignore b/.gitignore index 57bd9f2..ffddaa5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ schroedinger-1.0.9.tar.gz +/schroedinger-1.0.10.tar.gz diff --git a/schroedinger-no-testsuite.patch b/schroedinger-no-testsuite.patch deleted file mode 100644 index 80cdc56..0000000 --- a/schroedinger-no-testsuite.patch +++ /dev/null @@ -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 - diff --git a/schroedinger.spec b/schroedinger.spec index 6f79251..73716fa 100644 --- a/schroedinger.spec +++ b/schroedinger.spec @@ -1,22 +1,20 @@ %define abi 1.0 Name: schroedinger -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.0.10 +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 -# Issue is known upstream, fixed in git and so fixed in NEXT_RELEASE -Patch0: %{name}-no-testsuite.patch +Source0: http://www.diracvideo.org/download/schroedinger/schroedinger-%{version}.tar.gz 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 - 1.0.10-1 +- Update to 1.0.10 + * Tue Apr 22 2010 Fabian Deutsch - 1.0.9-2 - Added dependency on gtk-doc diff --git a/sources b/sources index fc53a9e..2fec319 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d67ec48b7c506db8c8b49156bf409e60 schroedinger-1.0.9.tar.gz +9de088ccc314bb9e766cb3aa6510a0ef schroedinger-1.0.10.tar.gz