rpms/mythtv/devel mythtv.spec,1.81,1.82
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8816
Modified Files:
mythtv.spec
Log Message:
Fix rfbz#1956
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mythtv.spec 27 Sep 2011 21:58:08 -0000 1.81
+++ mythtv.spec 3 Oct 2011 21:59:57 -0000 1.82
@@ -83,7 +83,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -333,7 +333,7 @@
Requires: python-MythTV = %{version}-%{release}
Requires: mythplugins = %{version}-%{release}
-Requires: mythtv-themes = %{version}
+Requires: mythtv-themes >= 0.24
Requires: mysql-server >= 5, mysql >= 5
# XMLTV is not yet packaged for rpmfusion
@@ -1453,6 +1453,9 @@
################################################################################
%changelog
+* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.24.1-2
+- Rebuilt and fix requires mythtv-themes - rfbz#1956
+
* Tue May 17 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24.1-1
- Update to 0.24.1 stable update release
12 years, 7 months
rpms/lastfm/devel dead.package, NONE, 1.1 lastfm.desktop, 1.2, NONE lastfm-gcc43.patch, 1.1, NONE lastfm-gpod-pkgconfig.patch, 1.1, NONE lastfm-prefix.patch, 1.1, NONE lastfm-qt45.patch, 1.1, NONE lastfm.spec, 1.9, NONE sources, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/lastfm/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5479
Added Files:
dead.package
Removed Files:
lastfm.desktop lastfm-gcc43.patch lastfm-gpod-pkgconfig.patch
lastfm-prefix.patch lastfm-qt45.patch lastfm.spec sources
Log Message:
dead.package
--- NEW FILE dead.package ---
# Orphaned by the previous maintainer
# Feel free to take over
--- lastfm.desktop DELETED ---
--- lastfm-gcc43.patch DELETED ---
--- lastfm-gpod-pkgconfig.patch DELETED ---
--- lastfm-prefix.patch DELETED ---
--- lastfm-qt45.patch DELETED ---
--- lastfm.spec DELETED ---
--- sources DELETED ---
12 years, 7 months
rpms/dvdrip/devel dvdrip.spec,1.12,1.13
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/dvdrip/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5081
Modified Files:
dvdrip.spec
Log Message:
Fix filtering
Index: dvdrip.spec
===================================================================
RCS file: /cvs/free/rpms/dvdrip/devel/dvdrip.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dvdrip.spec 3 Oct 2011 21:12:18 -0000 1.12
+++ dvdrip.spec 3 Oct 2011 21:31:21 -0000 1.13
@@ -1,6 +1,6 @@
Name: dvdrip
Version: 0.98.11
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Graphical DVD ripping and encoding tool
Group: Applications/Multimedia
@@ -34,7 +34,7 @@
#Filtering
%{?filter_setup:
-%filter_from_provides /perl(Video::DVDRip::Task)/d
+%filter_from_requires /perl(Video::DVDRip::Task)/d
%filter_setup
}
@@ -155,7 +155,7 @@
%changelog
-* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.98.11-4
+* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.98.11-5
- Filter perl(Video::DVDRip::Task)
* Tue Sep 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.98.11-3
12 years, 7 months
rpms/libdlna/devel dead.package, NONE, 1.1 libdlna-0.2.3-ffmpeg-header-move.patch, 1.2, NONE libdlna-pkgconfig.patch, 1.1, NONE sources, 1.2, NONE libdlna.spec, 1.12, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libdlna/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4593
Added Files:
dead.package
Removed Files:
libdlna-0.2.3-ffmpeg-header-move.patch libdlna-pkgconfig.patch
sources libdlna.spec
Log Message:
dead.package
--- NEW FILE dead.package ---
# Orphaned by the previous maintainer
# Feel free to take over
--- libdlna-0.2.3-ffmpeg-header-move.patch DELETED ---
--- libdlna-pkgconfig.patch DELETED ---
--- sources DELETED ---
--- libdlna.spec DELETED ---
12 years, 7 months
rpms/wl-kmod/devel dead.package, NONE, 1.1 broadcom-wl-5.60.48.36-2.6.33-kernel.patch, 1.1, NONE broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch, 1.1, NONE broadcom-wl-5.60.48.36-license.patch, 1.1, NONE broadcom-wl-5.60.48.36-multicast-kernel.patch, 1.1, NONE broadcom-wl-kmodtool-excludekernel-filterfile, 1.1, NONE sources, 1.9, NONE wl-kmod.spec, 1.53, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4248
Added Files:
dead.package
Removed Files:
broadcom-wl-5.60.48.36-2.6.33-kernel.patch
broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch
broadcom-wl-5.60.48.36-license.patch
broadcom-wl-5.60.48.36-multicast-kernel.patch
broadcom-wl-kmodtool-excludekernel-filterfile sources
wl-kmod.spec
Log Message:
dead.package
--- NEW FILE dead.package ---
# Orphaned by the previous maintainer
# Feel free to take over
--- broadcom-wl-5.60.48.36-2.6.33-kernel.patch DELETED ---
--- broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch DELETED ---
--- broadcom-wl-5.60.48.36-license.patch DELETED ---
--- broadcom-wl-5.60.48.36-multicast-kernel.patch DELETED ---
--- broadcom-wl-kmodtool-excludekernel-filterfile DELETED ---
--- sources DELETED ---
--- wl-kmod.spec DELETED ---
12 years, 7 months
rpms/broadcom-wl/devel dead.package, NONE, 1.1 broadcom-wl-blacklist.conf, 1.1, NONE broadcom-wl.spec, 1.10, NONE README.txt, 1.3, NONE sources, 1.9, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/broadcom-wl/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3853
Added Files:
dead.package
Removed Files:
broadcom-wl-blacklist.conf broadcom-wl.spec README.txt sources
Log Message:
dead.package
--- NEW FILE dead.package ---
# Orphaned by the previous maintainer
# Feel free to take over
--- broadcom-wl-blacklist.conf DELETED ---
--- broadcom-wl.spec DELETED ---
--- README.txt DELETED ---
--- sources DELETED ---
12 years, 7 months
rpms/dvdrip/devel dvdrip.spec,1.11,1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/dvdrip/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2506
Modified Files:
dvdrip.spec
Log Message:
Filter from provides
Index: dvdrip.spec
===================================================================
RCS file: /cvs/free/rpms/dvdrip/devel/dvdrip.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dvdrip.spec 27 Sep 2011 20:25:22 -0000 1.11
+++ dvdrip.spec 3 Oct 2011 21:12:18 -0000 1.12
@@ -1,6 +1,6 @@
Name: dvdrip
Version: 0.98.11
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical DVD ripping and encoding tool
Group: Applications/Multimedia
@@ -32,6 +32,13 @@
# according to ffmpeg/MPlayer developers
# -master Requires: fping
+#Filtering
+%{?filter_setup:
+%filter_from_provides /perl(Video::DVDRip::Task)/d
+%filter_setup
+}
+
+
%description
dvd::rip is a full featured DVD copy program. It provides an easy to use but
feature-rich Gtk+ GUI to control almost all aspects of the ripping and
@@ -148,6 +155,9 @@
%changelog
+* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.98.11-4
+- Filter perl(Video::DVDRip::Task)
+
* Tue Sep 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.98.11-3
- Rebuilt for perl
12 years, 7 months
rpms/gpac/devel gpac.spec, 1.32, 1.33 gpac-0.4.6_15-soname.patch, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29111
Modified Files:
gpac.spec gpac-0.4.6_15-soname.patch
Log Message:
Update gpac-soname.patch
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gpac.spec 23 Sep 2011 12:48:02 -0000 1.32
+++ gpac.spec 3 Oct 2011 20:29:28 -0000 1.33
@@ -17,7 +17,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
-Release: 0.16.svn%{?svn}%{?dist}
+Release: 0.17.svn%{?svn}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -331,6 +331,9 @@
%changelog
+* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.17.svn20110923
+- Update gpac-soname.patch
+
* Fri Sep 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.16svn20110923
- Update to 20110923
- Fix svnversion
gpac-0.4.6_15-soname.patch:
Makefile | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
Index: gpac-0.4.6_15-soname.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac-0.4.6_15-soname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.6_15-soname.patch 22 Sep 2011 21:12:14 -0000 1.1
+++ gpac-0.4.6_15-soname.patch 3 Oct 2011 20:29:28 -0000 1.2
@@ -1,7 +1,7 @@
diff -up gpac/src/Makefile.soname gpac/src/Makefile
---- gpac/src/Makefile.soname 2011-09-22 22:52:41.453724213 +0200
-+++ gpac/src/Makefile 2011-09-22 22:56:31.621576300 +0200
-@@ -158,12 +158,17 @@ endif
+--- gpac/src/Makefile.soname 2011-07-01 17:38:17.000000000 +0200
++++ gpac/src/Makefile 2011-10-03 22:25:32.362122207 +0200
+@@ -158,17 +158,19 @@ endif
##libgpac library output
@@ -9,19 +9,22 @@
+LIBGPAC=libgpac.$(DYN_LIB_SUFFIX)
+LIBGPAC_SOVERSION=".0"
+LIBGPAC_SONAME=$(LIBGPAC)$(LIBGPAC_SOVERSION)
-+LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)"
ifeq ($(CONFIG_WIN32),yes)
#LDFLAGS+=-export-symbols libgpac.def
-+LD_SONAME=
else
ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
+LDFLAGS+=-install_name $(prefix)/lib/$(LIBGPAC)
-+LD_SONAME=
endif
EXTRALIBS+=$(GPAC_SH_FLAGS)
endif
-@@ -181,7 +186,7 @@ SRCS := $(OBJS:.o=.c)
+
+-LD_SONAME="-Wl,-soname,$(LIB)"
++LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)"
+ ifeq ($(CONFIG_DARWIN), yes)
+ LD_SONAME=
+ endif
+@@ -181,7 +183,7 @@ SRCS := $(OBJS:.o=.c)
all: lib
@@ -30,7 +33,7 @@
#there's a bunch of warnings in there, get rid of them
mcrypt: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include"
-@@ -200,7 +205,7 @@ compositor: $(LIBGPAC_COMPOSITOR)
+@@ -200,7 +202,7 @@ compositor: $(LIBGPAC_COMPOSITOR)
$(CC) $(CFLAGS) -c -o $@ $<
@@ -39,7 +42,7 @@
ifeq ($(CONFIG_DARWIN),yes)
libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS)
ranlib ../bin/gcc/libgpac_static.a
-@@ -218,7 +223,7 @@ depend:
+@@ -218,7 +220,7 @@ depend:
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
clean:
12 years, 7 months
rpms/sonic-visualiser-freeworld/devel sonic-visualiser-1.8-no_virt_QObject.patch, NONE, 1.1 sonic-visualiser-1.8-raptor2.patch, NONE, 1.1 sonic-visualiser-freeworld.spec, 1.6, 1.7
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/sonic-visualiser-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24893
Modified Files:
sonic-visualiser-freeworld.spec
Added Files:
sonic-visualiser-1.8-no_virt_QObject.patch
sonic-visualiser-1.8-raptor2.patch
Log Message:
backport changes from Fedora package, for Qt 4.8 / raptor2 support
sonic-visualiser-1.8-no_virt_QObject.patch:
AudioCallbackPlaySource.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE sonic-visualiser-1.8-no_virt_QObject.patch ---
--- sonic-visualiser-1.8/svapp/audioio/AudioCallbackPlaySource.h.no_virt_QObject 2011-04-08 17:56:48.000000000 +0200
+++ sonic-visualiser-1.8/svapp/audioio/AudioCallbackPlaySource.h 2011-08-09 23:27:18.856064127 +0200
@@ -51,7 +51,7 @@
* provides a method for a realtime thread to pick up the latest
* available sample data from these buffers.
*/
-class AudioCallbackPlaySource : public virtual QObject,
+class AudioCallbackPlaySource : public QObject,
public AudioPlaySource
{
Q_OBJECT
sonic-visualiser-1.8-raptor2.patch:
sonic-visualiser/configure.ac | 2 +-
svapp/configure.ac | 2 +-
svcore/configure.ac | 2 +-
svgui/configure.ac | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE sonic-visualiser-1.8-raptor2.patch ---
* Add support for raptor2
* remove raptor references from configure.ac's that don't need/use it anywhere in
it's corresponding source code.
TODO: maintain compatibility with raptor(1) too?
diff -up sonic-visualiser-1.8/sonic-visualiser/configure.ac.raptor2 sonic-visualiser-1.8/sonic-visualiser/configure.ac
--- sonic-visualiser-1.8/sonic-visualiser/configure.ac.raptor2 2011-04-08 10:56:20.000000000 -0500
+++ sonic-visualiser-1.8/sonic-visualiser/configure.ac 2011-07-31 20:32:32.494052584 -0500
@@ -82,7 +82,7 @@ SV_MODULE_REQUIRED([samplerate],[sampler
SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.0],[vamp-hostsdk/PluginLoader.h],[],[])
SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
-SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
+#SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
SV_MODULE_REQUIRED([rasqal],[rasqal >= 0.9.19],[rasqal/rasqal.h],[rasqal],[rasqal_new_world])
SV_MODULE_REQUIRED([redland],[redland >= 1.0.10],[librdf.h],[rdf],[librdf_new_world])
diff -up sonic-visualiser-1.8/svapp/configure.ac.raptor2 sonic-visualiser-1.8/svapp/configure.ac
--- sonic-visualiser-1.8/svapp/configure.ac.raptor2 2011-04-08 10:56:48.000000000 -0500
+++ sonic-visualiser-1.8/svapp/configure.ac 2011-07-31 20:32:57.720737209 -0500
@@ -82,7 +82,7 @@ SV_MODULE_REQUIRED([samplerate],[sampler
SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.0],[vamp-hostsdk/PluginLoader.h],[],[])
SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
-SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
+#SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
SV_MODULE_REQUIRED([rasqal],[rasqal >= 0.9.19],[rasqal/rasqal.h],[rasqal],[rasqal_new_world])
SV_MODULE_REQUIRED([redland],[redland >= 1.0.10],[librdf.h],[rdf],[librdf_new_world])
diff -up sonic-visualiser-1.8/svcore/configure.ac.raptor2 sonic-visualiser-1.8/svcore/configure.ac
--- sonic-visualiser-1.8/svcore/configure.ac.raptor2 2011-04-08 10:56:35.000000000 -0500
+++ sonic-visualiser-1.8/svcore/configure.ac 2011-07-31 20:33:31.846310577 -0500
@@ -82,7 +82,7 @@ SV_MODULE_REQUIRED([samplerate],[sampler
SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.0],[vamp-hostsdk/PluginLoader.h],[],[])
SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
-SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
+SV_MODULE_REQUIRED([raptor2],[raptor2 >= 2.0.0],[raptor.h],[raptor],[raptor_start_parse])
SV_MODULE_REQUIRED([rasqal],[rasqal >= 0.9.19],[rasqal/rasqal.h],[rasqal],[rasqal_new_world])
SV_MODULE_REQUIRED([redland],[redland >= 1.0.10],[librdf.h],[rdf],[librdf_new_world])
diff -up sonic-visualiser-1.8/svgui/configure.ac.raptor2 sonic-visualiser-1.8/svgui/configure.ac
--- sonic-visualiser-1.8/svgui/configure.ac.raptor2 2011-04-08 10:56:44.000000000 -0500
+++ sonic-visualiser-1.8/svgui/configure.ac 2011-07-31 20:33:13.936534473 -0500
@@ -82,7 +82,7 @@ SV_MODULE_REQUIRED([samplerate],[sampler
SV_MODULE_REQUIRED([vamp],[vamp >= 2.1],[vamp/vamp.h],[],[])
SV_MODULE_REQUIRED([vamphostsdk],[vamp-hostsdk >= 2.0],[vamp-hostsdk/PluginLoader.h],[],[])
SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
-SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
+#SV_MODULE_REQUIRED([raptor],[raptor >= 1.4.20],[raptor.h],[raptor],[raptor_start_parse])
SV_MODULE_REQUIRED([rasqal],[rasqal >= 0.9.19],[rasqal/rasqal.h],[rasqal],[rasqal_new_world])
SV_MODULE_REQUIRED([redland],[redland >= 1.0.10],[librdf.h],[rdf],[librdf_new_world])
Index: sonic-visualiser-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/devel/sonic-visualiser-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sonic-visualiser-freeworld.spec 3 Oct 2011 19:21:28 -0000 1.6
+++ sonic-visualiser-freeworld.spec 3 Oct 2011 19:59:12 -0000 1.7
@@ -1,6 +1,6 @@
Name: sonic-visualiser-freeworld
Version: 1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A program for viewing and exploring audio data
Group: Applications/Multimedia
@@ -10,14 +10,28 @@
Source1: sonic-visualiser-freeworld.desktop
Patch0: sonic-visualiser-1.8-gcc46.patch
Patch1: sonic-visualiser-1.8-implicit-dso.patch
+Patch2: sonic-visualiser-1.8-no_virt_QObject.patch
+
+%if 0%{?el5}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
+
+## upstreamable patches
+# support raptor2
+# note too, this package currently doesn't explicitly BR raptor-devel or raptor2-devel
+# but relies on implicit deps from redland-devel
+Patch50: sonic-visualiser-1.8-raptor2.patch
+%if 0%{?fedora} > 15
+%global raptor2 1
+BuildRequires: automake autoconf
+%endif
BuildRequires: qt4-devel vamp-plugin-sdk-devel
BuildRequires: libsndfile-devel libsamplerate-devel fftw-devel bzip2-devel
BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: redland-devel rubberband-devel
-BuildRequires: libmad-devel
+BuildRequires: libmad-devel
BuildRequires: liboggz-devel libfishsound-devel liblo-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -41,11 +55,23 @@
%setup -q -n sonic-visualiser-%{version}
%patch0 -p1 -b .gcc46
%patch1 -p1 -b .implicit-dso
+%patch2 -p1 -b .no_virt_QObject
+
+%if 0%{?raptor2}
+%patch50 -p1 -b .raptor2
+for dir in sonic-visualiser svapp svcore svgui ; do
+pushd $dir
+sh ./bootstrap.sh
+popd
+done
+%endif
%build
%configure
#qmake-qt4
+
+# not SMP-safe
#make {?_smp_mflags}
make
@@ -66,8 +92,10 @@
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+%if 0%{?rhel}
%clean
rm -rf $RPM_BUILD_ROOT
+%endif
%post
@@ -94,6 +122,10 @@
%changelog
+* Mon Oct 3 2011 Michel Salim <salimma(a)fedoraproject.org> - 1.8-3
+- Fix for Qt 4.8 disallowing virtual inheritance of QObject (Radek Novacek)
+- patch for raptor2 support (Rex Dieter)
+
* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8-2
- Rebuild for librasqal
12 years, 7 months