rpms/smplayer/devel smplayer.spec, 1.18, 1.19 smplayer_enqueue_kde3.desktop, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5195
Modified Files:
smplayer.spec
Removed Files:
smplayer_enqueue_kde3.desktop
Log Message:
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-2
- fix smtube translations.
- drop support for Fedora < 9 and EPEL 5, since we need kde4.
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- smplayer.spec 28 Apr 2012 01:26:44 -0000 1.18
+++ smplayer.spec 28 Apr 2012 13:34:56 -0000 1.19
@@ -1,17 +1,8 @@
-# define correct path to used binaries
-# works on: fedora >= 7, centos >= 5
-%if 0%{?rhel} > 1
- %define _qt4_qmake %{_libdir}/qt4/bin/qmake
- %define _qt4_lrelease %{_libdir}/qt4/bin/lrelease
-%else
- %define _qt4_lrelease %{_bindir}/lrelease-qt4
-%endif
-
%define smtube_ver 1.1
Name: smplayer
Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
@@ -19,11 +10,9 @@
URL: http://smplayer.sourceforge.net/linux/
Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
# Add a servicemenu to enqeue files in smplayer's playlist.
-# The first one is for KDE4, the second one for KDE3.
# see also:
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
-Source2: smplayer_enqueue_kde3.desktop
Source3: http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
@@ -53,6 +42,8 @@
#remove some bundle sources
rm -rf zlib-1.2.6
rm -rf src/findsubtitles/quazip
+rm -rf src/qtsingleapplication/
+
%patch0 -p0 -b .desktop-files
%patch1 -p1 -b .quazip
%patch2 -p1 -b .qtsingleapplication
@@ -64,7 +55,7 @@
mv Changelog.utf8 Changelog
# use lrelease from qt4-devel
-sed -i 's|LRELEASE=lrelease|LRELEASE=%{_qt4_lrelease}|' Makefile
+sed -i 's|LRELEASE=lrelease|LRELEASE=%{_bindir}/lrelease-qt4|' Makefile
# fix path of docs
sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile
@@ -79,9 +70,9 @@
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
pushd smtube-%{smtube_ver}
-sed -i 's|lrelease|%{_qt4_lrelease}|' Makefile
+sed -i 's|lrelease|%{_bindir}/lrelease-qt4|' Makefile
sed -i 's|qmake|%{_qt4_qmake}|' Makefile
-sed -i 's|/usr/local|%{buildroot}%{_prefix}|' Makefile
+sed -i 's|/usr/local|%{_prefix}|' Makefile
sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
sed -i 's|smtube/translations|smplayer/translations|' Makefile
make PREFIX=%{_prefix}
@@ -91,7 +82,7 @@
%install
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install
pushd smtube-%{smtube_ver}
-make install
+make install DESTDIR=%{buildroot}
popd
desktop-file-install --delete-original \
@@ -109,11 +100,7 @@
# Add servicemenus dependend on the version of KDE:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&group_i...
-%if 0%{?fedora} >= 9
- install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-%else
- install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
-%endif
+install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%post
touch --no-create %{_datadir}/icons/hicolor
@@ -139,17 +126,14 @@
%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
%{_mandir}/man1/smplayer.1.gz
-
-%if 0%{?fedora} >= 9
- %dir %{_datadir}/kde4/services/ServiceMenus/
- %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-%else
- %dir %{_datadir}/apps/konqueror/
- %dir %{_datadir}/apps/konqueror/servicemenus/
- %{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
-%endif
+%dir %{_datadir}/kde4/services/ServiceMenus/
+%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%changelog
+* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-2
+- fix smtube translations.
+- drop support for Fedora < 9 and EPEL 5, since we need kde4.
+
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
- New release
- add smtube support
--- smplayer_enqueue_kde3.desktop DELETED ---
11 years, 12 months
rpms/smplayer/F-17 smplayer-0.8.0-desktop-files.patch, NONE, 1.1 smplayer-0.8.0-system-qtsingleapplication.patch, NONE, 1.1 smplayer-0.8.0-system-quazip.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 smplayer.spec, 1.16, 1.17 sources, 1.12, 1.13 smplayer-0.6.9-desktop-files.patch, 1.4, NONE smplayer-0.7.0-system-quazip.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2405
Modified Files:
.cvsignore smplayer.spec sources
Added Files:
smplayer-0.8.0-desktop-files.patch
smplayer-0.8.0-system-qtsingleapplication.patch
smplayer-0.8.0-system-quazip.patch
Removed Files:
smplayer-0.6.9-desktop-files.patch
smplayer-0.7.0-system-quazip.patch
Log Message:
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
- New release
- add smtube support
- use system qtsingleapplication
- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386
smplayer-0.8.0-desktop-files.patch:
smplayer.desktop | 2 +-
smplayer_enqueue.desktop | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE smplayer-0.8.0-desktop-files.patch ---
--- smplayer.desktop 2012-03-23 09:57:49.000000000 +0200
+++ smplayer.desktop 2012-04-06 04:39:05.971492030 +0300
@@ -13,7 +13,7 @@
Comment[uk]=Потужний інтерфейс до MPlayer
Comment[eu]=MPlayerrentzako interfaze grafiko handi bat
Comment[zh_CN]=一个优秀的 MPlayer 前端
-Exec=smplayer %U
+Exec=smplayer %f
GenericName=Media Player
GenericName[cs]=Přehrávač multimédií
GenericName[es]=Reproductor multimedia
--- smplayer_enqueue.desktop 2012-03-23 09:57:49.000000000 +0200
+++ smplayer_enqueue.desktop 2012-04-06 04:39:16.295388149 +0300
@@ -1,6 +1,6 @@
[Desktop Entry]
Categories=Qt;KDE;AudioVideo;Player;Video;
-Exec=smplayer -add-to-playlist %U
+Exec=smplayer -add-to-playlist %F
Icon=smplayer
MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
Name=Enqueue in SMPlayer
smplayer-0.8.0-system-qtsingleapplication.patch:
smtube-1.1/src/smtube.pro | 9 +++------
src/smplayer.pro | 10 +---------
2 files changed, 4 insertions(+), 15 deletions(-)
--- NEW FILE smplayer-0.8.0-system-qtsingleapplication.patch ---
--- smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-03-27 00:46:29.000000000 +0300
+++ smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-04-06 04:46:13.911416527 +0300
@@ -5,10 +5,11 @@
TEMPLATE = app
QT += network xml
TARGET =
-DEPENDPATH += . qtsingleapplication
-INCLUDEPATH += . qtsingleapplication
+DEPENDPATH += .
+INCLUDEPATH += .
CONFIG += qt warn_on release
+CONFIG += qtsingleapplication
RESOURCES = icons.qrc
@@ -61,10 +62,6 @@
translations/smtube_eu.ts \
translations/smtube_pt.ts
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-HEADERS += qtsingleapplication.h qtlocalpeer.h
-
unix {
UI_DIR = .ui
MOC_DIR = .moc
--- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300
+++ smplayer-0.8.0/src/smplayer.pro 2012-04-06 04:44:47.313246489 +0300
@@ -3,6 +3,7 @@
CONFIG += qt warn_on
CONFIG += release
+CONFIG += qtsingleapplication
#CONFIG += debug
QT += network xml
@@ -235,15 +236,6 @@
about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \
toolbareditor.ui
-# qtsingleapplication
-contains( DEFINES, SINGLE_INSTANCE ) {
- INCLUDEPATH += qtsingleapplication
- DEPENDPATH += qtsingleapplication
-
- SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
- HEADERS += qtsingleapplication.h qtlocalpeer.h
-}
-
# Find subtitles dialog
contains( DEFINES, FIND_SUBTITLES ) {
DEFINES += DOWNLOAD_SUBS
smplayer-0.8.0-system-quazip.patch:
findsubtitles/findsubtitles.pro | 20 ++------------------
smplayer.pro | 22 ++++------------------
2 files changed, 6 insertions(+), 36 deletions(-)
--- NEW FILE smplayer-0.8.0-system-quazip.patch ---
--- smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-03-31 15:46:16.000000000 +0300
+++ smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-04-27 21:58:55.535383047 +0300
@@ -34,30 +34,14 @@
DEFINES += NO_SMPLAYER_SUPPORT DOWNLOAD_SUBS
contains( DEFINES, DOWNLOAD_SUBS ) {
- INCLUDEPATH += filedownloader quazip
- DEPENDPATH += filedownloader quazip
+ INCLUDEPATH += filedownloader
+ DEPENDPATH += filedownloader
HEADERS += filedownloader.h subchooserdialog.h
SOURCES += filedownloader.cpp subchooserdialog.cpp
FORMS += subchooserdialog.ui
- HEADERS += crypt.h \
- ioapi.h \
- quazip.h \
- quazipfile.h \
- quazipfileinfo.h \
- quazipnewinfo.h \
- unzip.h \
- zip.h
-
- SOURCES += ioapi.c \
- quazip.cpp \
- quazipfile.cpp \
- quazipnewinfo.cpp \
- unzip.c \
- zip.c
-
LIBS += -lz
win32 {
--- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300
+++ smplayer-0.8.0/src/smplayer.pro 2012-04-27 22:03:15.636757443 +0300
@@ -258,31 +258,17 @@
# Download subtitles
contains( DEFINES, DOWNLOAD_SUBS ) {
- INCLUDEPATH += findsubtitles/filedownloader findsubtitles/quazip
- DEPENDPATH += findsubtitles/filedownloader findsubtitles/quazip
+ INCLUDEPATH += findsubtitles/filedownloader
+ DEPENDPATH += findsubtitles/filedownloader
HEADERS += filedownloader.h subchooserdialog.h fixsubs.h
SOURCES += filedownloader.cpp subchooserdialog.cpp fixsubs.cpp
FORMS += subchooserdialog.ui
- HEADERS += crypt.h \
- ioapi.h \
- quazip.h \
- quazipfile.h \
- quazipfileinfo.h \
- quazipnewinfo.h \
- unzip.h \
- zip.h
+ INCLUDEPATH += /usr/include/quazip /usr/include/minizip
- SOURCES += ioapi.c \
- quazip.cpp \
- quazipfile.cpp \
- quazipnewinfo.cpp \
- unzip.c \
- zip.c
-
- LIBS += -lz
+ LIBS += -lz -lquazip
win32 {
INCLUDEPATH += ..\\zlib-1.2.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-17/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 24 Mar 2012 03:07:19 -0000 1.12
+++ .cvsignore 28 Apr 2012 01:45:28 -0000 1.13
@@ -1 +1,2 @@
-smplayer-0.7.1.tar.bz2
+smplayer-0.8.0.tar.bz2
+smtube-1.1.tar.bz2
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-17/smplayer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- smplayer.spec 24 Mar 2012 03:07:19 -0000 1.16
+++ smplayer.spec 28 Apr 2012 01:45:28 -0000 1.17
@@ -7,29 +7,34 @@
%define _qt4_lrelease %{_bindir}/lrelease-qt4
%endif
+%define smtube_ver 1.1
+
Name: smplayer
-Version: 0.7.1
+Version: 0.8.0
Release: 1%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
License: GPLv2+
URL: http://smplayer.sourceforge.net/linux/
-Source0: http://downloads.sourceforge.net/sourceforge/smplayer/smplayer-%{version}...
+Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
# Add a servicemenu to enqeue files in smplayer's playlist.
# The first one is for KDE4, the second one for KDE3.
# see also:
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
Source2: smplayer_enqueue_kde3.desktop
+Source3: http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
-Patch0: smplayer-0.6.9-desktop-files.patch
-Patch1: smplayer-0.7.0-system-quazip.patch
+Patch0: smplayer-0.8.0-desktop-files.patch
+Patch1: smplayer-0.8.0-system-quazip.patch
+Patch2: smplayer-0.8.0-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
BuildRequires: quazip-devel
+BuildRequires: qtsingleapplication-devel
# smplayer without mplayer is quite useless
Requires: mplayer
Requires: kde-filesystem
@@ -44,11 +49,13 @@
%prep
%setup -qn %{name}-%{version}
+%setup -a3 -qn %{name}-%{version}
#remove some bundle sources
rm -rf zlib-1.2.6
rm -rf src/findsubtitles/quazip
%patch0 -p0 -b .desktop-files
%patch1 -p1 -b .quazip
+%patch2 -p1 -b .qtsingleapplication
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -71,9 +78,21 @@
%build
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
+pushd smtube-%{smtube_ver}
+sed -i 's|lrelease|%{_qt4_lrelease}|' Makefile
+sed -i 's|qmake|%{_qt4_qmake}|' Makefile
+sed -i 's|/usr/local|%{buildroot}%{_prefix}|' Makefile
+sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
+sed -i 's|smtube/translations|smplayer/translations|' Makefile
+make PREFIX=%{_prefix}
+popd
+
+
%install
-rm -rf %{buildroot}
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install
+pushd smtube-%{smtube_ver}
+make install
+popd
desktop-file-install --delete-original \
--vendor "rpmfusion" \
@@ -86,6 +105,8 @@
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/%{name}_enqueue.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/smtube.desktop
+
# Add servicemenus dependend on the version of KDE:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&group_i...
%if 0%{?fedora} >= 9
@@ -94,10 +115,6 @@
install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
%endif
-
-%clean
-rm -rf %{buildroot}
-
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -113,11 +130,13 @@
update-desktop-database &> /dev/null || :
%files
-%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/
%{_bindir}/smplayer
+%{_bindir}/smtube
%{_datadir}/applications/rpmfusion-smplayer*.desktop
+%{_datadir}/applications/smtube.desktop
%{_datadir}/icons/hicolor/*/apps/smplayer.png
+%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
%{_mandir}/man1/smplayer.1.gz
@@ -131,6 +150,12 @@
%endif
%changelog
+* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
+- New release
+- add smtube support
+- use system qtsingleapplication
+- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386
+
* Sat Mar 24 2012 Sérgio Basto <sergio(a)serjux.com> - 0.7.1-1
- New upstream version: 0.7.1, changelog says "This version includes some bug fixes,
some of them important. It's highly recommended to update."
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-17/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 24 Mar 2012 03:07:19 -0000 1.12
+++ sources 28 Apr 2012 01:45:28 -0000 1.13
@@ -1 +1,2 @@
-e50046399ee918bb7b57e98971425c95 smplayer-0.7.1.tar.bz2
+8f7d3a9c116e956c68976d0e5dbb83dd smplayer-0.8.0.tar.bz2
+e5018fcd9ebdc08658136476ba4843d2 smtube-1.1.tar.bz2
--- smplayer-0.6.9-desktop-files.patch DELETED ---
--- smplayer-0.7.0-system-quazip.patch DELETED ---
12 years
rpms/smplayer/devel smplayer-0.8.0-desktop-files.patch, NONE, 1.1 smplayer-0.8.0-system-qtsingleapplication.patch, NONE, 1.1 smplayer-0.8.0-system-quazip.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 smplayer.spec, 1.17, 1.18 sources, 1.12, 1.13 smplayer-0.6.9-desktop-files.patch, 1.4, NONE smplayer-0.7.0-system-quazip.patch, 1.2, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1635
Modified Files:
.cvsignore smplayer.spec sources
Added Files:
smplayer-0.8.0-desktop-files.patch
smplayer-0.8.0-system-qtsingleapplication.patch
smplayer-0.8.0-system-quazip.patch
Removed Files:
smplayer-0.6.9-desktop-files.patch
smplayer-0.7.0-system-quazip.patch
Log Message:
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
- New release
- add smtube support
- use system qtsingleapplication
- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386
smplayer-0.8.0-desktop-files.patch:
smplayer.desktop | 2 +-
smplayer_enqueue.desktop | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE smplayer-0.8.0-desktop-files.patch ---
--- smplayer.desktop 2012-03-23 09:57:49.000000000 +0200
+++ smplayer.desktop 2012-04-06 04:39:05.971492030 +0300
@@ -13,7 +13,7 @@
Comment[uk]=Потужний інтерфейс до MPlayer
Comment[eu]=MPlayerrentzako interfaze grafiko handi bat
Comment[zh_CN]=一个优秀的 MPlayer 前端
-Exec=smplayer %U
+Exec=smplayer %f
GenericName=Media Player
GenericName[cs]=Přehrávač multimédií
GenericName[es]=Reproductor multimedia
--- smplayer_enqueue.desktop 2012-03-23 09:57:49.000000000 +0200
+++ smplayer_enqueue.desktop 2012-04-06 04:39:16.295388149 +0300
@@ -1,6 +1,6 @@
[Desktop Entry]
Categories=Qt;KDE;AudioVideo;Player;Video;
-Exec=smplayer -add-to-playlist %U
+Exec=smplayer -add-to-playlist %F
Icon=smplayer
MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
Name=Enqueue in SMPlayer
smplayer-0.8.0-system-qtsingleapplication.patch:
smtube-1.1/src/smtube.pro | 9 +++------
src/smplayer.pro | 10 +---------
2 files changed, 4 insertions(+), 15 deletions(-)
--- NEW FILE smplayer-0.8.0-system-qtsingleapplication.patch ---
--- smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-03-27 00:46:29.000000000 +0300
+++ smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-04-06 04:46:13.911416527 +0300
@@ -5,10 +5,11 @@
TEMPLATE = app
QT += network xml
TARGET =
-DEPENDPATH += . qtsingleapplication
-INCLUDEPATH += . qtsingleapplication
+DEPENDPATH += .
+INCLUDEPATH += .
CONFIG += qt warn_on release
+CONFIG += qtsingleapplication
RESOURCES = icons.qrc
@@ -61,10 +62,6 @@
translations/smtube_eu.ts \
translations/smtube_pt.ts
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-HEADERS += qtsingleapplication.h qtlocalpeer.h
-
unix {
UI_DIR = .ui
MOC_DIR = .moc
--- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300
+++ smplayer-0.8.0/src/smplayer.pro 2012-04-06 04:44:47.313246489 +0300
@@ -3,6 +3,7 @@
CONFIG += qt warn_on
CONFIG += release
+CONFIG += qtsingleapplication
#CONFIG += debug
QT += network xml
@@ -235,15 +236,6 @@
about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \
toolbareditor.ui
-# qtsingleapplication
-contains( DEFINES, SINGLE_INSTANCE ) {
- INCLUDEPATH += qtsingleapplication
- DEPENDPATH += qtsingleapplication
-
- SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
- HEADERS += qtsingleapplication.h qtlocalpeer.h
-}
-
# Find subtitles dialog
contains( DEFINES, FIND_SUBTITLES ) {
DEFINES += DOWNLOAD_SUBS
smplayer-0.8.0-system-quazip.patch:
findsubtitles/findsubtitles.pro | 20 ++------------------
smplayer.pro | 22 ++++------------------
2 files changed, 6 insertions(+), 36 deletions(-)
--- NEW FILE smplayer-0.8.0-system-quazip.patch ---
--- smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-03-31 15:46:16.000000000 +0300
+++ smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-04-27 21:58:55.535383047 +0300
@@ -34,30 +34,14 @@
DEFINES += NO_SMPLAYER_SUPPORT DOWNLOAD_SUBS
contains( DEFINES, DOWNLOAD_SUBS ) {
- INCLUDEPATH += filedownloader quazip
- DEPENDPATH += filedownloader quazip
+ INCLUDEPATH += filedownloader
+ DEPENDPATH += filedownloader
HEADERS += filedownloader.h subchooserdialog.h
SOURCES += filedownloader.cpp subchooserdialog.cpp
FORMS += subchooserdialog.ui
- HEADERS += crypt.h \
- ioapi.h \
- quazip.h \
- quazipfile.h \
- quazipfileinfo.h \
- quazipnewinfo.h \
- unzip.h \
- zip.h
-
- SOURCES += ioapi.c \
- quazip.cpp \
- quazipfile.cpp \
- quazipnewinfo.cpp \
- unzip.c \
- zip.c
-
LIBS += -lz
win32 {
--- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300
+++ smplayer-0.8.0/src/smplayer.pro 2012-04-27 22:03:15.636757443 +0300
@@ -258,31 +258,17 @@
# Download subtitles
contains( DEFINES, DOWNLOAD_SUBS ) {
- INCLUDEPATH += findsubtitles/filedownloader findsubtitles/quazip
- DEPENDPATH += findsubtitles/filedownloader findsubtitles/quazip
+ INCLUDEPATH += findsubtitles/filedownloader
+ DEPENDPATH += findsubtitles/filedownloader
HEADERS += filedownloader.h subchooserdialog.h fixsubs.h
SOURCES += filedownloader.cpp subchooserdialog.cpp fixsubs.cpp
FORMS += subchooserdialog.ui
- HEADERS += crypt.h \
- ioapi.h \
- quazip.h \
- quazipfile.h \
- quazipfileinfo.h \
- quazipnewinfo.h \
- unzip.h \
- zip.h
+ INCLUDEPATH += /usr/include/quazip /usr/include/minizip
- SOURCES += ioapi.c \
- quazip.cpp \
- quazipfile.cpp \
- quazipnewinfo.cpp \
- unzip.c \
- zip.c
-
- LIBS += -lz
+ LIBS += -lz -lquazip
win32 {
INCLUDEPATH += ..\\zlib-1.2.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 24 Mar 2012 02:39:09 -0000 1.12
+++ .cvsignore 28 Apr 2012 01:26:44 -0000 1.13
@@ -1 +1,2 @@
-smplayer-0.7.1.tar.bz2
+smplayer-0.8.0.tar.bz2
+smtube-1.1.tar.bz2
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- smplayer.spec 24 Mar 2012 02:39:09 -0000 1.17
+++ smplayer.spec 28 Apr 2012 01:26:44 -0000 1.18
@@ -7,29 +7,34 @@
%define _qt4_lrelease %{_bindir}/lrelease-qt4
%endif
+%define smtube_ver 1.1
+
Name: smplayer
-Version: 0.7.1
+Version: 0.8.0
Release: 1%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
License: GPLv2+
URL: http://smplayer.sourceforge.net/linux/
-Source0: http://downloads.sourceforge.net/sourceforge/smplayer/smplayer-%{version}...
+Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
# Add a servicemenu to enqeue files in smplayer's playlist.
# The first one is for KDE4, the second one for KDE3.
# see also:
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
Source2: smplayer_enqueue_kde3.desktop
+Source3: http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
-Patch0: smplayer-0.6.9-desktop-files.patch
-Patch1: smplayer-0.7.0-system-quazip.patch
+Patch0: smplayer-0.8.0-desktop-files.patch
+Patch1: smplayer-0.8.0-system-quazip.patch
+Patch2: smplayer-0.8.0-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
BuildRequires: quazip-devel
+BuildRequires: qtsingleapplication-devel
# smplayer without mplayer is quite useless
Requires: mplayer
Requires: kde-filesystem
@@ -44,11 +49,13 @@
%prep
%setup -qn %{name}-%{version}
+%setup -a3 -qn %{name}-%{version}
#remove some bundle sources
rm -rf zlib-1.2.6
rm -rf src/findsubtitles/quazip
%patch0 -p0 -b .desktop-files
%patch1 -p1 -b .quazip
+%patch2 -p1 -b .qtsingleapplication
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -71,9 +78,21 @@
%build
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
+pushd smtube-%{smtube_ver}
+sed -i 's|lrelease|%{_qt4_lrelease}|' Makefile
+sed -i 's|qmake|%{_qt4_qmake}|' Makefile
+sed -i 's|/usr/local|%{buildroot}%{_prefix}|' Makefile
+sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
+sed -i 's|smtube/translations|smplayer/translations|' Makefile
+make PREFIX=%{_prefix}
+popd
+
+
%install
-rm -rf %{buildroot}
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install
+pushd smtube-%{smtube_ver}
+make install
+popd
desktop-file-install --delete-original \
--vendor "rpmfusion" \
@@ -86,6 +105,8 @@
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/%{name}_enqueue.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/smtube.desktop
+
# Add servicemenus dependend on the version of KDE:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&group_i...
%if 0%{?fedora} >= 9
@@ -94,10 +115,6 @@
install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
%endif
-
-%clean
-rm -rf %{buildroot}
-
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -113,11 +130,13 @@
update-desktop-database &> /dev/null || :
%files
-%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/
%{_bindir}/smplayer
+%{_bindir}/smtube
%{_datadir}/applications/rpmfusion-smplayer*.desktop
+%{_datadir}/applications/smtube.desktop
%{_datadir}/icons/hicolor/*/apps/smplayer.png
+%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
%{_mandir}/man1/smplayer.1.gz
@@ -131,6 +150,12 @@
%endif
%changelog
+* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
+- New release
+- add smtube support
+- use system qtsingleapplication
+- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386
+
* Sat Mar 24 2012 Sérgio Basto <sergio(a)serjux.com> - 0.7.1-1
- New upstream version: 0.7.1, changelog says "This version includes some bug fixes,
some of them important. It's highly recommended to update."
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 24 Mar 2012 02:39:09 -0000 1.12
+++ sources 28 Apr 2012 01:26:44 -0000 1.13
@@ -1 +1,2 @@
-e50046399ee918bb7b57e98971425c95 smplayer-0.7.1.tar.bz2
+8f7d3a9c116e956c68976d0e5dbb83dd smplayer-0.8.0.tar.bz2
+e5018fcd9ebdc08658136476ba4843d2 smtube-1.1.tar.bz2
--- smplayer-0.6.9-desktop-files.patch DELETED ---
--- smplayer-0.7.0-system-quazip.patch DELETED ---
12 years
rpms/desmume/F-15 .cvsignore, 1.9, 1.10 desmume.spec, 1.16, 1.17 sources, 1.9, 1.10 desmume-0.9.5-bigendian.patch, 1.1, NONE desmume-0.9.7-gcc47.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13619
Modified Files:
.cvsignore desmume.spec sources
Removed Files:
desmume-0.9.5-bigendian.patch desmume-0.9.7-gcc47.patch
Log Message:
* Thu Apr 26 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.8-1
- Updated to upstream version 0.9.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-15/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 20 Feb 2011 18:34:17 -0000 1.9
+++ .cvsignore 27 Apr 2012 13:15:45 -0000 1.10
@@ -1 +1 @@
-desmume-0.9.7.tar.gz
+desmume-0.9.8.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-15/desmume.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- desmume.spec 15 Apr 2012 16:08:37 -0000 1.16
+++ desmume.spec 27 Apr 2012 13:15:45 -0000 1.17
@@ -1,6 +1,6 @@
Name: desmume
-Version: 0.9.7
-Release: 5%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
@@ -9,8 +9,6 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Do not look into builddir
Patch0: %{name}-0.9-dontlookinbuilddir.patch
-# Fixes FTBFS for gcc 4.7
-Patch1: %{name}-0.9.7-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkglext-devel
@@ -51,7 +49,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
# Fix end-of-line encoding
sed -i 's/\r//' AUTHORS
@@ -180,6 +177,9 @@
%changelog
+* Thu Apr 26 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.8-1
+- Updated to upstream version 0.9.8
+
* Sun Apr 15 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-5
- Fixed microphone support (BZ #2231)
- Enabled LUA engine
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 20 Feb 2011 18:34:17 -0000 1.9
+++ sources 27 Apr 2012 13:15:45 -0000 1.10
@@ -1 +1 @@
-c33440e6a02c44248871ec2eec6a3760 desmume-0.9.7.tar.gz
+fb7c984c924087888b9eaaad8cb1875e desmume-0.9.8.tar.gz
--- desmume-0.9.5-bigendian.patch DELETED ---
--- desmume-0.9.7-gcc47.patch DELETED ---
12 years
rpms/desmume/F-16 .cvsignore, 1.9, 1.10 desmume.spec, 1.16, 1.17 sources, 1.9, 1.10 desmume-0.9.5-bigendian.patch, 1.1, NONE desmume-0.9.7-gcc47.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13418
Modified Files:
.cvsignore desmume.spec sources
Removed Files:
desmume-0.9.5-bigendian.patch desmume-0.9.7-gcc47.patch
Log Message:
* Thu Apr 26 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.8-1
- Updated to upstream version 0.9.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-16/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 20 Feb 2011 18:34:17 -0000 1.9
+++ .cvsignore 27 Apr 2012 13:14:31 -0000 1.10
@@ -1 +1 @@
-desmume-0.9.7.tar.gz
+desmume-0.9.8.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-16/desmume.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- desmume.spec 15 Apr 2012 16:08:07 -0000 1.16
+++ desmume.spec 27 Apr 2012 13:14:31 -0000 1.17
@@ -1,6 +1,6 @@
Name: desmume
-Version: 0.9.7
-Release: 5%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
@@ -9,8 +9,6 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Do not look into builddir
Patch0: %{name}-0.9-dontlookinbuilddir.patch
-# Fixes FTBFS for gcc 4.7
-Patch1: %{name}-0.9.7-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkglext-devel
@@ -51,7 +49,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
# Fix end-of-line encoding
sed -i 's/\r//' AUTHORS
@@ -180,6 +177,9 @@
%changelog
+* Thu Apr 26 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.8-1
+- Updated to upstream version 0.9.8
+
* Sun Apr 15 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-5
- Fixed microphone support (BZ #2231)
- Enabled LUA engine
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-16/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 20 Feb 2011 18:34:17 -0000 1.9
+++ sources 27 Apr 2012 13:14:31 -0000 1.10
@@ -1 +1 @@
-c33440e6a02c44248871ec2eec6a3760 desmume-0.9.7.tar.gz
+fb7c984c924087888b9eaaad8cb1875e desmume-0.9.8.tar.gz
--- desmume-0.9.5-bigendian.patch DELETED ---
--- desmume-0.9.7-gcc47.patch DELETED ---
12 years
rpms/desmume/F-17 .cvsignore, 1.9, 1.10 desmume.spec, 1.18, 1.19 sources, 1.9, 1.10 desmume-0.9.7-gcc47.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13213
Modified Files:
.cvsignore desmume.spec sources
Removed Files:
desmume-0.9.7-gcc47.patch
Log Message:
* Thu Apr 26 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.8-1
- Updated to upstream version 0.9.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-17/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 20 Feb 2011 18:34:17 -0000 1.9
+++ .cvsignore 27 Apr 2012 13:12:57 -0000 1.10
@@ -1 +1 @@
-desmume-0.9.7.tar.gz
+desmume-0.9.8.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-17/desmume.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- desmume.spec 15 Apr 2012 16:07:36 -0000 1.18
+++ desmume.spec 27 Apr 2012 13:12:57 -0000 1.19
@@ -1,6 +1,6 @@
Name: desmume
-Version: 0.9.7
-Release: 5%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
@@ -9,8 +9,6 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Do not look into builddir
Patch0: %{name}-0.9-dontlookinbuilddir.patch
-# Fixes FTBFS for gcc 4.7
-Patch1: %{name}-0.9.7-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkglext-devel
@@ -51,7 +49,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
# Fix end-of-line encoding
sed -i 's/\r//' AUTHORS
@@ -180,6 +177,9 @@
%changelog
+* Thu Apr 26 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.8-1
+- Updated to upstream version 0.9.8
+
* Sun Apr 15 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-5
- Fixed microphone support (BZ #2231)
- Enabled LUA engine
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-17/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 20 Feb 2011 18:34:17 -0000 1.9
+++ sources 27 Apr 2012 13:12:57 -0000 1.10
@@ -1 +1 @@
-c33440e6a02c44248871ec2eec6a3760 desmume-0.9.7.tar.gz
+fb7c984c924087888b9eaaad8cb1875e desmume-0.9.8.tar.gz
--- desmume-0.9.7-gcc47.patch DELETED ---
12 years
rpms/desmume/devel .cvsignore, 1.9, 1.10 desmume.spec, 1.18, 1.19 sources, 1.9, 1.10 desmume-0.9.7-gcc47.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13051
Modified Files:
.cvsignore desmume.spec sources
Removed Files:
desmume-0.9.7-gcc47.patch
Log Message:
* Thu Apr 26 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.8-1
- Updated to upstream version 0.9.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 20 Feb 2011 18:34:17 -0000 1.9
+++ .cvsignore 27 Apr 2012 13:11:54 -0000 1.10
@@ -1 +1 @@
-desmume-0.9.7.tar.gz
+desmume-0.9.8.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/desmume.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- desmume.spec 15 Apr 2012 16:07:09 -0000 1.18
+++ desmume.spec 27 Apr 2012 13:11:54 -0000 1.19
@@ -1,6 +1,6 @@
Name: desmume
-Version: 0.9.7
-Release: 5%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
@@ -9,8 +9,6 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# Do not look into builddir
Patch0: %{name}-0.9-dontlookinbuilddir.patch
-# Fixes FTBFS for gcc 4.7
-Patch1: %{name}-0.9.7-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkglext-devel
@@ -51,7 +49,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
# Fix end-of-line encoding
sed -i 's/\r//' AUTHORS
@@ -180,6 +177,9 @@
%changelog
+* Thu Apr 26 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.8-1
+- Updated to upstream version 0.9.8
+
* Sun Apr 15 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.9.7-5
- Fixed microphone support (BZ #2231)
- Enabled LUA engine
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 20 Feb 2011 18:34:17 -0000 1.9
+++ sources 27 Apr 2012 13:11:54 -0000 1.10
@@ -1 +1 @@
-c33440e6a02c44248871ec2eec6a3760 desmume-0.9.7.tar.gz
+fb7c984c924087888b9eaaad8cb1875e desmume-0.9.8.tar.gz
--- desmume-0.9.7-gcc47.patch DELETED ---
12 years
rpms/catalyst-kmod/F-16 catalyst-kmod.spec,1.45,1.46
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11956
Modified Files:
catalyst-kmod.spec
Log Message:
* Fri Apr 27 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-1
- Update to Catalyst 12.4 (internal version 8.961)
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- catalyst-kmod.spec 27 Apr 2012 12:43:19 -0000 1.45
+++ catalyst-kmod.spec 27 Apr 2012 12:47:08 -0000 1.46
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
12 years
rpms/catalyst-kmod/F-16 .cvsignore, 1.8, 1.9 catalyst-kmod.spec, 1.44, 1.45 sources, 1.8, 1.9
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11784
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Fri Apr 27 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-1
- Update to Catalyst 12.4 (internal version 8.961)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 5 Feb 2012 19:05:51 -0000 1.8
+++ .cvsignore 27 Apr 2012 12:43:19 -0000 1.9
@@ -1 +1 @@
-catalyst-kmod-data-12.1.tar.bz2
+catalyst-kmod-data-12.4.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/catalyst-kmod.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- catalyst-kmod.spec 22 Apr 2012 10:57:44 -0000 1.44
+++ catalyst-kmod.spec 27 Apr 2012 12:43:19 -0000 1.45
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 12.3
-Release: 2%{?dist}.5
+Version: 12.4
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -103,6 +103,9 @@
%changelog
+* Fri Apr 27 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-1
+- Update to Catalyst 12.4 (internal version 8.961)
+
* Sun Apr 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 12.3-2.5
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-16/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 30 Mar 2012 11:04:15 -0000 1.8
+++ sources 27 Apr 2012 12:43:19 -0000 1.9
@@ -1 +1 @@
-b234bbb76947415916cc76006697ba80 catalyst-kmod-data-12.3.tar.bz2
+a7435617867b5bdef827ecf3d46902c4 catalyst-kmod-data-12.4.tar.bz2
12 years
rpms/xorg-x11-drv-catalyst/F-16 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-catalyst.spec, 1.8, 1.9
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11220
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Fri Apr 27 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-1
- Update to Catalyst 12.4 (internal version 8.961)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 30 Mar 2012 11:13:02 -0000 1.8
+++ .cvsignore 27 Apr 2012 12:27:33 -0000 1.9
@@ -1 +1,2 @@
amd-driver-installer-12-3-x86.x86_64.run
+amd-driver-installer-12-4-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 30 Mar 2012 11:15:58 -0000 1.8
+++ sources 27 Apr 2012 12:27:33 -0000 1.9
@@ -1,2 +1,2 @@
-7c7b82f0d87a7ce9ee816b7d77212faa amd-driver-installer-12-3-x86.x86_64.run
+e57d65cb9c9fa470d6d80072d5ab2785 amd-driver-installer-12-4-x86.x86_64.run
b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-16/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-catalyst.spec 30 Mar 2012 11:13:02 -0000 1.8
+++ xorg-x11-drv-catalyst.spec 27 Apr 2012 12:27:33 -0000 1.9
@@ -4,13 +4,13 @@
%global __strip /bin/true
Name: xorg-x11-drv-catalyst
-Version: 12.3
+Version: 12.4
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/amd-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/amd-dri...
Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
Source2: catalyst-README.Fedora
Source3: amdcccle.desktop
@@ -394,6 +394,9 @@
%changelog
+* Fri Apr 27 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-1
+- Update to Catalyst 12.4 (internal version 8.961)
+
* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
- Update to Catalyst 12.3 (internal version 8.951)
12 years