rpms/xbmc/devel xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch, NONE, 1.1 xbmc.spec, 1.25, 1.26
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26562
Modified Files:
xbmc.spec
Added Files:
xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch
Log Message:
Patch from upstream to fix builds for GCC 4.6.x, slightly modified
to handle previous patches for Makefile.in http://trac.xbmc.org/ticket/11383
xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch:
b/xbmc/cores/dvdplayer/Codecs/Makefile.in | 18 +++++++--------
xbmc-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 +--
2 files changed, 11 insertions(+), 11 deletions(-)
--- NEW FILE xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch ---
>From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan(a)openelec.tv>
Date: Wed, 30 Mar 2011 14:57:28 +0200
Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383
Signed-off-by: Stephan Raue <stephan(a)openelec.tv>
---
xbmc/cores/dvdplayer/Codecs/Makefile.in | 18 +++++++++---------
xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in
index a7ef1a0..308664a 100644
--- a/xbmc/cores/dvdplayer/Codecs/Makefile.in
+++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in
@@ -148,32 +148,32 @@ liba52:
else
$(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
ifneq ($(ARCH), arm)
$(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
else # No ARM version of swscale available yet.
$(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libswscale/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
$(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so
- $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
ffmpeg/libavutil/libavutil.so : ffmpeg;
@@ -185,17 +185,17 @@ ffmpeg:
$(MAKE) -C $@
$(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
libdts/libdts/bitstream.o \
libdts/libdts/downmix.o libdts/libdts/parse.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la
- $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \
-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \
-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
libdts/libdts/libdts.a : libdts;
--- xbmc-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in.orig 2011-03-30 23:13:00.901672912 -0400
+++ xbmc-10.1/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2011-03-30 23:13:23.837829699 -0400
@@ -48,12 +48,12 @@
else
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
libdvdcss/src/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
endif
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xbmc.spec 30 Mar 2011 05:31:36 -0000 1.25
+++ xbmc.spec 31 Mar 2011 03:22:04 -0000 1.26
@@ -5,7 +5,7 @@
Name: xbmc
Version: 10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -44,6 +44,10 @@
# to find Python 2.7 (needed for F-14+)
Patch6: xbmc-10-python2.7.patch
+# patch from upstream to fix builds for GCC 4.6.x
+# (committed to git upstream: http://trac.xbmc.org/ticket/11383)
+Patch7: xbmc-Dharma-10.1-gcc-4.6-fixes-0.1.patch
+
ExcludeArch: ppc64
Buildroot: %{_tmppath}/%{name}-%{version}
Summary: Media center
@@ -158,6 +162,7 @@
%patch4 -p1
%patch5 -p0
%patch6 -p0
+%patch7 -p1
# Prevent rerunning the autotools.
touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \
@@ -225,6 +230,11 @@
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
+* Wed Mar 30 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-2
+- Patch from upstream to fix builds for GCC 4.6.x, slightly modified
+ to handle previous patches for Makefile.in
+ http://trac.xbmc.org/ticket/11383
+
* Tue Mar 29 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-1
- Update to 10.1
- Add support for using system python-imaging and pysqlite modules, thanks to Pierre
13 years
rpms/minitube/F-13 minitube-1.4.1-lang.patch, NONE, 1.1 minitube.spec, 1.6, 1.7
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17082
Modified Files:
minitube.spec
Added Files:
minitube-1.4.1-lang.patch
Log Message:
new lang patch for 1.4.1
minitube-1.4.1-lang.patch:
locale.pri | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE minitube-1.4.1-lang.patch ---
diff -up minitube/locale/locale.pri.orig minitube/locale/locale.pri
--- minitube/locale/locale.pri.orig 2011-03-19 13:37:43.035724368 +0200
+++ minitube/locale/locale.pri 2011-03-19 13:39:05.132716910 +0200
@@ -12,8 +12,8 @@ isEmpty(QMAKE_LRELEASE) {
}
updateqm.input = TRANSLATIONS
-updateqm.output = build/target/locale/${QMAKE_FILE_BASE}.qm
-updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm build/target/locale/${QMAKE_FILE_BASE}.qm
+updateqm.output = build/target/locale/minitube_${QMAKE_FILE_BASE}.qm
+updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm build/target/locale/minitube_${QMAKE_FILE_BASE}.qm
updateqm.CONFIG += no_link target_predeps
QMAKE_EXTRA_COMPILERS += updateqm
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/minitube.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- minitube.spec 30 Mar 2011 14:33:23 -0000 1.6
+++ minitube.spec 30 Mar 2011 15:37:19 -0000 1.7
@@ -1,6 +1,6 @@
Name: minitube
Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -121,7 +121,7 @@
%dir %{_datadir}/%{name}/locale
%changelog
-* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
+* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-2
- version bump
- new lang patch
- cleaned spec of comments and old patches
13 years, 1 month
rpms/minitube/F-14 minitube.spec,1.7,1.8
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16919
Modified Files:
minitube.spec
Log Message:
* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-2
- version bump
- new lang patch
- cleaned spec of comments and old patches
- update Requires to match f-15 gstreamer defaults
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/minitube.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- minitube.spec 30 Mar 2011 14:32:23 -0000 1.7
+++ minitube.spec 30 Mar 2011 15:36:08 -0000 1.8
@@ -1,6 +1,6 @@
Name: minitube
Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -121,7 +121,7 @@
%dir %{_datadir}/%{name}/locale
%changelog
-* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
+* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-2
- version bump
- new lang patch
- cleaned spec of comments and old patches
13 years, 1 month
rpms/minitube/F-14 minitube-1.4.1-lang.patch,NONE,1.1
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16538
Added Files:
minitube-1.4.1-lang.patch
Log Message:
new lang patch for 1.4.1
minitube-1.4.1-lang.patch:
locale.pri | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE minitube-1.4.1-lang.patch ---
diff -up minitube/locale/locale.pri.orig minitube/locale/locale.pri
--- minitube/locale/locale.pri.orig 2011-03-19 13:37:43.035724368 +0200
+++ minitube/locale/locale.pri 2011-03-19 13:39:05.132716910 +0200
@@ -12,8 +12,8 @@ isEmpty(QMAKE_LRELEASE) {
}
updateqm.input = TRANSLATIONS
-updateqm.output = build/target/locale/${QMAKE_FILE_BASE}.qm
-updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm build/target/locale/${QMAKE_FILE_BASE}.qm
+updateqm.output = build/target/locale/minitube_${QMAKE_FILE_BASE}.qm
+updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm build/target/locale/minitube_${QMAKE_FILE_BASE}.qm
updateqm.CONFIG += no_link target_predeps
QMAKE_EXTRA_COMPILERS += updateqm
13 years, 1 month
rpms/minitube/devel minitube-1.4.1-lang.patch,NONE,1.1
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10978
Added Files:
minitube-1.4.1-lang.patch
Log Message:
new lang patch for 1.4.1
minitube-1.4.1-lang.patch:
locale.pri | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE minitube-1.4.1-lang.patch ---
diff -up minitube/locale/locale.pri.orig minitube/locale/locale.pri
--- minitube/locale/locale.pri.orig 2011-03-19 13:37:43.035724368 +0200
+++ minitube/locale/locale.pri 2011-03-19 13:39:05.132716910 +0200
@@ -12,8 +12,8 @@ isEmpty(QMAKE_LRELEASE) {
}
updateqm.input = TRANSLATIONS
-updateqm.output = build/target/locale/${QMAKE_FILE_BASE}.qm
-updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm build/target/locale/${QMAKE_FILE_BASE}.qm
+updateqm.output = build/target/locale/minitube_${QMAKE_FILE_BASE}.qm
+updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm build/target/locale/minitube_${QMAKE_FILE_BASE}.qm
updateqm.CONFIG += no_link target_predeps
QMAKE_EXTRA_COMPILERS += updateqm
13 years, 1 month
rpms/minitube/devel minitube.spec,1.7,1.8
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10416
Modified Files:
minitube.spec
Log Message:
* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-2
- version bump
- new lang patch
- cleaned spec of comments and old patches
- update Requires to match f-15 gstreamer defaults
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/minitube.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- minitube.spec 30 Mar 2011 14:30:59 -0000 1.7
+++ minitube.spec 30 Mar 2011 14:39:29 -0000 1.8
@@ -1,6 +1,6 @@
Name: minitube
Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -121,7 +121,7 @@
%dir %{_datadir}/%{name}/locale
%changelog
-* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
+* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-2
- version bump
- new lang patch
- cleaned spec of comments and old patches
13 years, 1 month
rpms/minitube/F-13 .cvsignore, 1.5, 1.6 minitube.spec, 1.5, 1.6 sources, 1.5, 1.6
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9553
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
- version bump
- new lang patch
- cleaned spec of comments and old patches
- update Requires to match f-15 gstreamer defaults
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 21 Feb 2011 13:02:28 -0000 1.5
+++ .cvsignore 30 Mar 2011 14:33:23 -0000 1.6
@@ -1 +1 @@
-minitube-1.4.tar.gz
+minitube-1.4.1.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/minitube.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- minitube.spec 21 Feb 2011 13:02:28 -0000 1.5
+++ minitube.spec 30 Mar 2011 14:33:23 -0000 1.6
@@ -1,12 +1,11 @@
Name: minitube
-Version: 1.4
+Version: 1.4.1
Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
-
# License info:
-###
+#
# LGPLv2.1 with exceptions or GPLv3:
# src/iconloader/qticonloader.h
# src/iconloader/qticonloader.cpp
@@ -14,33 +13,28 @@
# src/searchlineedit.cpp
#
# LGPLv2 with exceptions or GPLv3:
-# src/urllineedit.h
+# src/urllineedit.h
# src/urllineedit.cpp
#
# GPLv2 or GPLv3:
-# src/flickcharm.cpp
+# src/flickcharm.cpp
# src/flickcharm.h
#
# LGPLv2.1:
-# src/minisplitter.h
+# src/minisplitter.h
# src/minisplitter.cpp
#
# All other files are GPLv3+ as per INSTALL file
-###
+#
# End Of License info.
-
# The source files combined together into minitube binary are GPLv3, and the .qm files are GPLv3+
+
License: GPLv3 and GPLv3+
URL: http://flavio.tordini.org/minitube
Source0: http://flavio.tordini.org/files/%{name}/%{name}-%{version}.tar.gz
-
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-
-# fix breakage caused by qtsingleapplication-add-api.patch
-# Patch1: minitube-QString.patch
-# name the lang files
-Patch2: minitube-lang.patch
+Patch1: minitube-1.4.1-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -50,8 +44,14 @@
BuildRequires: phonon-devel
BuildRequires: qtsingleapplication-devel
Requires: hicolor-icon-theme
-Requires: xine-lib-extras-freeworld
+# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
+# add gstreamer-ffmpeg as Required.
+%if 0%{?fedora} && 0%{?fedora} > 14
+Requires: gstreamer-ffmpeg
+%else
+Requires: xine-lib-extras-freeworld
+%endif
%description
Minitube is a YouTube desktop client.
@@ -69,16 +69,9 @@
# remove bundled copy of qtsingleapplication
rm -rf src/qtsingleapplication
-# rename latvian language code
-mv locale/lat.ts locale/lv.ts
-# rename macedoninan language code
-mv locale/mkd_MKD.ts locale/mk_MK.ts
-
%patch0 -p 1
-#%%patch1 -p 0
-
-%patch2 -p1 -b .lang
+%patch1 -p1 -b .orig
%build
%{_qt4_qmake} PREFIX=%{_prefix}
@@ -93,8 +86,6 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-
-# find_lang magic:
%find_lang %{name} --all-name --with-qt
%clean
@@ -130,6 +121,12 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
+- version bump
+- new lang patch
+- cleaned spec of comments and old patches
+- update Requires to match f-15 gstreamer defaults
+
* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
- version bump
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 21 Feb 2011 13:02:28 -0000 1.5
+++ sources 30 Mar 2011 14:33:23 -0000 1.6
@@ -1 +1 @@
-3091dd589722680941bfc64ce0778354 minitube-1.4.tar.gz
+180ba4af94d1de42599b97209187ef51 minitube-1.4.1.tar.gz
13 years, 1 month
rpms/minitube/F-14 .cvsignore, 1.5, 1.6 minitube.spec, 1.6, 1.7 sources, 1.5, 1.6
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9353
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
- version bump
- new lang patch
- cleaned spec of comments and old patches
- update Requires to match f-15 gstreamer defaults
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 21 Feb 2011 12:58:56 -0000 1.5
+++ .cvsignore 30 Mar 2011 14:32:23 -0000 1.6
@@ -1 +1 @@
-minitube-1.4.tar.gz
+minitube-1.4.1.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/minitube.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- minitube.spec 21 Feb 2011 12:58:56 -0000 1.6
+++ minitube.spec 30 Mar 2011 14:32:23 -0000 1.7
@@ -1,12 +1,11 @@
Name: minitube
-Version: 1.4
+Version: 1.4.1
Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
-
# License info:
-###
+#
# LGPLv2.1 with exceptions or GPLv3:
# src/iconloader/qticonloader.h
# src/iconloader/qticonloader.cpp
@@ -14,33 +13,28 @@
# src/searchlineedit.cpp
#
# LGPLv2 with exceptions or GPLv3:
-# src/urllineedit.h
+# src/urllineedit.h
# src/urllineedit.cpp
#
# GPLv2 or GPLv3:
-# src/flickcharm.cpp
+# src/flickcharm.cpp
# src/flickcharm.h
#
# LGPLv2.1:
-# src/minisplitter.h
+# src/minisplitter.h
# src/minisplitter.cpp
#
# All other files are GPLv3+ as per INSTALL file
-###
+#
# End Of License info.
-
# The source files combined together into minitube binary are GPLv3, and the .qm files are GPLv3+
+
License: GPLv3 and GPLv3+
URL: http://flavio.tordini.org/minitube
Source0: http://flavio.tordini.org/files/%{name}/%{name}-%{version}.tar.gz
-
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-
-# fix breakage caused by qtsingleapplication-add-api.patch
-# Patch1: minitube-QString.patch
-# name the lang files
-Patch2: minitube-lang.patch
+Patch1: minitube-1.4.1-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -50,8 +44,14 @@
BuildRequires: phonon-devel
BuildRequires: qtsingleapplication-devel
Requires: hicolor-icon-theme
-Requires: xine-lib-extras-freeworld
+# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
+# add gstreamer-ffmpeg as Required.
+%if 0%{?fedora} && 0%{?fedora} > 14
+Requires: gstreamer-ffmpeg
+%else
+Requires: xine-lib-extras-freeworld
+%endif
%description
Minitube is a YouTube desktop client.
@@ -69,16 +69,9 @@
# remove bundled copy of qtsingleapplication
rm -rf src/qtsingleapplication
-# rename latvian language code
-mv locale/lat.ts locale/lv.ts
-# rename macedoninan language code
-mv locale/mkd_MKD.ts locale/mk_MK.ts
-
%patch0 -p 1
-#%%patch1 -p 0
-
-%patch2 -p1 -b .lang
+%patch1 -p1 -b .orig
%build
%{_qt4_qmake} PREFIX=%{_prefix}
@@ -93,8 +86,6 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-
-# find_lang magic:
%find_lang %{name} --all-name --with-qt
%clean
@@ -130,6 +121,12 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
+- version bump
+- new lang patch
+- cleaned spec of comments and old patches
+- update Requires to match f-15 gstreamer defaults
+
* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
- version bump
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-14/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 21 Feb 2011 12:58:56 -0000 1.5
+++ sources 30 Mar 2011 14:32:23 -0000 1.6
@@ -1 +1 @@
-3091dd589722680941bfc64ce0778354 minitube-1.4.tar.gz
+180ba4af94d1de42599b97209187ef51 minitube-1.4.1.tar.gz
13 years, 1 month
rpms/xbmc/F-13 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xbmc-generate-tarball-xz.sh, 1.2, 1.3 xbmc.spec, 1.8, 1.9
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9035
Modified Files:
.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
Update to 10.1. Add support for using system python-imaging and pysqlite modules,
thanks to Pierre Ossman for patch (#1575). Drop most references to SVNVERSION,
upstream now uses git
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 24 Dec 2010 04:39:25 -0000 1.3
+++ .cvsignore 30 Mar 2011 14:31:08 -0000 1.4
@@ -1 +1 @@
-xbmc-10.0-Dharma-patched.tar.xz
+xbmc-10.1-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 24 Dec 2010 04:39:26 -0000 1.3
+++ sources 30 Mar 2011 14:31:08 -0000 1.4
@@ -1 +1 @@
-b3f969d96f4f598352c19e599d3534da xbmc-10.0-Dharma-patched.tar.xz
+48b245821464216f154aef16b88651f5 xbmc-10.1-patched.tar.xz
Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-13/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xbmc-generate-tarball-xz.sh 24 Dec 2010 04:39:27 -0000 1.2
+++ xbmc-generate-tarball-xz.sh 30 Mar 2011 14:31:08 -0000 1.3
@@ -1,20 +1,18 @@
#!/bin/sh
-MAJORVERSION=10.0
+MAJORVERSION=10.1
-# pull from Dharma branch
-SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
+# FIXME: need to update to use git
+#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
# uncomment this to switch to trunk
#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
# use SVN version number passed from script, or otherwise use default
SVNVERSION=${1-35567}
-# uncomment following if you want to always pull from tip of branch
-# SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2)
-VERSION=$MAJORVERSION-Dharma
-# SVN snapshot
+VERSION=$MAJORVERSION
+# git snapshot
#VERSION=$MAJORVERSION-$SVNVERSION
# pre-release
#VERSION=Dharma_rc2
@@ -22,19 +20,14 @@
# remove existing checkout
rm -r xbmc-$VERSION
-#svn export -r $SVNVERSION $SVNURL xbmc-$VERSION
-
# don't need to extra tarball, already expanded
# comment out with tarball
tar -xzvf xbmc-$VERSION.tar.gz
-# rename tarball directory
-mv -i $VERSION xbmc-$VERSION
cd xbmc-$VERSION
# remove bundled libraries (including zlib and OSX), saves space and forces using external versions
# also remove legally problematic libGoAhead library
-#for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun
for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libhdhomerun
do
rm -r xbmc/lib/$i
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-13/xbmc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xbmc.spec 13 Feb 2011 11:41:28 -0000 1.8
+++ xbmc.spec 30 Mar 2011 14:31:08 -0000 1.9
@@ -1,14 +1,11 @@
-%global SVNVERSION 35648
#global PRERELEASE Dharma_rc2
-%global DIRVERSION %{version}-Dharma
-# use below for SVN snapshot
-#global DIRVERSION %{version}-%{SVNVERSION}
+%global DIRVERSION %{version}
# use below for pre-release
#global DIRVERSION %{PRERELEASE}
Name: xbmc
-Version: 10.0
-Release: 1%{?dist}.3
+Version: 10.1
+Release: 1%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -138,6 +135,13 @@
Requires: librtmp
Requires: libbluray
+# These are just symlinked to, but needed both at build-time
+# and for installation
+BuildRequires: python-imaging
+Requires: python-imaging
+BuildRequires: python-sqlite2
+Requires: python-sqlite2
+
%description
XBMC media center is a free cross-platform media-player jukebox and
entertainment hub. XBMC can play a spectrum of of multimedia formats,
@@ -174,7 +178,6 @@
--disable-libdts --disable-liba52 \
--disable-dvdcss \
--disable-optimizations --disable-debug \
-SVN_REV=%{SVNVERSION} \
CPPFLAGS="-I/usr/include/ffmpeg" \
CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \
@@ -199,6 +202,14 @@
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/xbmc.desktop
+# Normally we are expected to build these manually. But since we are using
+# the system Python interpreter, we also want to use the system libraries
+install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib
+ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib/PIL
+install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib
+ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -214,8 +225,14 @@
%{_datadir}/icons/hicolor/*/*/*.png
%changelog
-* Thu Feb 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10.0-1.3
-- Rebuild for libmicrohttpd ABI bump
+* Tue Mar 29 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-1
+- Update to 10.1
+- Add support for using system python-imaging and pysqlite modules, thanks to Pierre
+ Ossman for patch (#1575)
+- Drop most references to SVNVERSION, upstream now uses git
+
+* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10.0-2
+- Rebuild for libmysqlclient
* Thu Dec 23 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-1
- Update to 10.0 (Dharma final)
13 years, 1 month
rpms/minitube/devel .cvsignore, 1.5, 1.6 minitube.spec, 1.6, 1.7 sources, 1.5, 1.6
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9069
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
- version bump
- new lang patch
- cleaned spec of comments and old patches
- update Requires to match f-15 gstreamer defaults
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 21 Feb 2011 12:44:05 -0000 1.5
+++ .cvsignore 30 Mar 2011 14:30:59 -0000 1.6
@@ -1 +1 @@
-minitube-1.4.tar.gz
+minitube-1.4.1.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/minitube.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- minitube.spec 21 Feb 2011 12:44:05 -0000 1.6
+++ minitube.spec 30 Mar 2011 14:30:59 -0000 1.7
@@ -1,12 +1,11 @@
Name: minitube
-Version: 1.4
+Version: 1.4.1
Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
-
# License info:
-###
+#
# LGPLv2.1 with exceptions or GPLv3:
# src/iconloader/qticonloader.h
# src/iconloader/qticonloader.cpp
@@ -14,33 +13,28 @@
# src/searchlineedit.cpp
#
# LGPLv2 with exceptions or GPLv3:
-# src/urllineedit.h
+# src/urllineedit.h
# src/urllineedit.cpp
#
# GPLv2 or GPLv3:
-# src/flickcharm.cpp
+# src/flickcharm.cpp
# src/flickcharm.h
#
# LGPLv2.1:
-# src/minisplitter.h
+# src/minisplitter.h
# src/minisplitter.cpp
#
# All other files are GPLv3+ as per INSTALL file
-###
+#
# End Of License info.
-
# The source files combined together into minitube binary are GPLv3, and the .qm files are GPLv3+
+
License: GPLv3 and GPLv3+
URL: http://flavio.tordini.org/minitube
Source0: http://flavio.tordini.org/files/%{name}/%{name}-%{version}.tar.gz
-
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-
-# fix breakage caused by qtsingleapplication-add-api.patch
-# Patch1: minitube-QString.patch
-# name the lang files
-Patch2: minitube-lang.patch
+Patch1: minitube-1.4.1-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -50,8 +44,14 @@
BuildRequires: phonon-devel
BuildRequires: qtsingleapplication-devel
Requires: hicolor-icon-theme
-Requires: xine-lib-extras-freeworld
+# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
+# add gstreamer-ffmpeg as Required.
+%if 0%{?fedora} && 0%{?fedora} > 14
+Requires: gstreamer-ffmpeg
+%else
+Requires: xine-lib-extras-freeworld
+%endif
%description
Minitube is a YouTube desktop client.
@@ -69,16 +69,9 @@
# remove bundled copy of qtsingleapplication
rm -rf src/qtsingleapplication
-# rename latvian language code
-mv locale/lat.ts locale/lv.ts
-# rename macedoninan language code
-mv locale/mkd_MKD.ts locale/mk_MK.ts
-
%patch0 -p 1
-#%%patch1 -p 0
-
-%patch2 -p1 -b .lang
+%patch1 -p1 -b .orig
%build
%{_qt4_qmake} PREFIX=%{_prefix}
@@ -93,8 +86,6 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-
-# find_lang magic:
%find_lang %{name} --all-name --with-qt
%clean
@@ -130,6 +121,12 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Wed Mar 30 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4.1-1
+- version bump
+- new lang patch
+- cleaned spec of comments and old patches
+- update Requires to match f-15 gstreamer defaults
+
* Fri Feb 11 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.4-1
- version bump
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 21 Feb 2011 12:44:05 -0000 1.5
+++ sources 30 Mar 2011 14:30:59 -0000 1.6
@@ -1 +1 @@
-3091dd589722680941bfc64ce0778354 minitube-1.4.tar.gz
+180ba4af94d1de42599b97209187ef51 minitube-1.4.1.tar.gz
13 years, 1 month