From 1181bc17f4fd603ffbbb2e872d4f1447b68836141217907c625a9213aa687469 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 3 Aug 2009 23:13:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/schroedinger?expand=0&rev=5 --- schroedinger-am111.patch | 24 ++++++++++++++++++++++++ schroedinger.changes | 6 ++++++ schroedinger.spec | 10 +++++++--- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 schroedinger-am111.patch diff --git a/schroedinger-am111.patch b/schroedinger-am111.patch new file mode 100644 index 0000000..10d0b73 --- /dev/null +++ b/schroedinger-am111.patch @@ -0,0 +1,24 @@ +From: David Schleef +Date: Wed, 1 Jul 2009 00:06:06 +0000 (-0700) +Subject: build: don't install headers twice +X-Git-Url: http://diracvideo.org/git?p=schroedinger.git;a=commitdiff_plain;h=1541481dc1dfa9293b0fbbc7634718b31d901340 + +build: don't install headers twice +--- + +diff --git a/schroedinger/Makefile.am b/schroedinger/Makefile.am +index 4c04b3b..af617bc 100644 +--- a/schroedinger/Makefile.am ++++ b/schroedinger/Makefile.am +@@ -57,9 +57,7 @@ pkginclude_HEADERS = \ + schroutils.h \ + schrovideoformat.h \ + schrovirtframe.h \ +- schrowavelet.h \ +- schrobitstream.h \ +- schromotion.h ++ schrowavelet.h + + nodist_pkginclude_HEADERS = \ + schroversion.h + diff --git a/schroedinger.changes b/schroedinger.changes index 075c170..370a624 100644 --- a/schroedinger.changes +++ b/schroedinger.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 21 21:46:09 CEST 2009 - dominique-obs@leuenberger.net + +- Require gcc-c++ +- schroedinger-am111.patch, taken from upstream git + ------------------------------------------------------------------- Wed Jul 1 17:04:07 CEST 2009 - sbrabec@suse.cz diff --git a/schroedinger.spec b/schroedinger.spec index db863df..6370cbf 100644 --- a/schroedinger.spec +++ b/schroedinger.spec @@ -26,13 +26,16 @@ Url: http://schrodinger.sourceforge.net/ Group: Productivity/Multimedia/Other License: GPL v2 only ; LGPL v2.0 only ; MPL .. ; MIT License (or similar) Version: 1.0.7 -Release: 1 +Release: 2 Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM schroedinger-am111.patch taken from git, 154148 -- Do not install headers twice +Patch0: schroedinger-am111.patch # PATCH-FIX-UPSTREAM schroedinger-strict-aliasing.patch 7831a506bc6714b3db40e31584e61ccaa71d78d9 sbrabec@suse.cz -- Fix strict aliasing. -Patch: %{name}-strict-aliasing.patch +Patch1: %{name}-strict-aliasing.patch AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gstreamer-0_10-devel >= %{min_gst_version} gstreamer-0_10-plugins-base-devel >= %{min_gst_version} gtk-doc liboil-devel >= %{min_oil_version} pkg-config +BuildRequires: gcc-c++ %description The Schroedinger project implements portable libraries for the high @@ -131,7 +134,8 @@ Authors: %prep %setup -q -n schroedinger-%{version} -%patch -p1 +%patch0 -p1 +%patch1 -p1 %build %configure\