Accepting request 70381 from KDE:Distro:Factory
OBS-URL: https://build.opensuse.org/request/show/70381 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=40
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
parent
785cd82d19
commit
d29fb250d7
@ -5,7 +5,7 @@
|
||||
Type=Service
|
||||
Actions=PlayAudioCd;
|
||||
-X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'Audio'
|
||||
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Audio' ]
|
||||
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'Audio' ]
|
||||
|
||||
[Desktop Action PlayAudioCd]
|
||||
Name=Play Audio CD with Kaffeine
|
||||
@ -16,7 +16,7 @@
|
||||
Type=Service
|
||||
Actions=PlayDVD;
|
||||
-X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'VideoDvd'
|
||||
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'VideoDvd' ]
|
||||
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoDvd' ]
|
||||
|
||||
[Desktop Action PlayDVD]
|
||||
Name=Play DVD with Kaffeine
|
||||
@ -26,8 +26,8 @@
|
||||
[Desktop Entry]
|
||||
Type=Service
|
||||
Actions=PlayVideoCd;
|
||||
-X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'VideoCd|SuperVideoCd'
|
||||
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'VideoCd|SuperVideoCd' ]
|
||||
-X-KDE-Solid-Predicate=[OpticalDisc.availableContent & 'VideoCd' OR OpticalDisc.availableContent & 'SuperVideoCd']
|
||||
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoCd|SuperVideoCd' ]
|
||||
|
||||
[Desktop Action PlayVideoCd]
|
||||
Name=Play Video CD with Kaffeine
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:17eed8dd0641e3d90cd32cac44361501294f7e4f58ec4955fb20f439b6694efe
|
||||
size 300838
|
||||
3
kaffeine-1.2.2.tar.bz2
Normal file
3
kaffeine-1.2.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3531d980a1083abeb69f8b8ff4ddbb371a38ab866f7d6917caaa9b5bfa80b557
|
||||
size 365603
|
||||
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 27 20:23:37 UTC 2011 - asterios.dramis@gmail.com
|
||||
|
||||
- Spec file updates:
|
||||
* Fix locales removal if suse_version is not set.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 19 21:02:57 UTC 2011 - asterios.dramis@gmail.com
|
||||
|
||||
- Update to 1.2.2:
|
||||
* fix crash after removing channels
|
||||
- Spec file updates:
|
||||
* Added more descriptions for the patches based on openSUSE Patches
|
||||
Guidelines.
|
||||
* Fixed locales removal for openSUSE < 11.4.
|
||||
* Minor other updates.
|
||||
- Fixed, rebased and applied fix_plasma_startup_error.diff patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 7 16:09:05 UTC 2011 - msvec@novell.com
|
||||
|
||||
- Update to 1.2.1:
|
||||
* add search function to epg
|
||||
* implement ATSC support for epg
|
||||
* fix gnome screen saver inhibition
|
||||
* other fixes and improvements
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 15 20:57:16 UTC 2011 - ctrippe@gmx.net
|
||||
|
||||
|
||||
@ -19,28 +19,28 @@
|
||||
|
||||
|
||||
Name: kaffeine
|
||||
Version: 1.1
|
||||
Version: 1.2.2
|
||||
Release: 9
|
||||
Summary: Xine-Based Multimedia Player
|
||||
|
||||
License: GPLv2+
|
||||
Url: http://kaffeine.kde.org/
|
||||
Group: Productivity/Multimedia/Video/Players
|
||||
|
||||
Requires: libqt4-sql-sqlite
|
||||
|
||||
# http://sourceforge.net/projects/kaffeine/files/current/kaffeine-1.2.2.tar.gz
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: %{name}-icons.tar.bz2
|
||||
Patch1: kaffeine-fixsplitter.patch
|
||||
Patch2: fix_plasma_startup_error.diff
|
||||
# PATCH-FIX-OPENSUSE ksuseinstall.diff llunak@novell.com -- Support for on-demand codecs install using ksuseinstall
|
||||
Patch3: ksuseinstall.diff
|
||||
# PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters)
|
||||
Patch0: kaffeine-fixsplitter.patch
|
||||
# PATCH-FIX-OPENSUSE fix_plasma_startup_error.diff -- Fix plasma solid actions
|
||||
Patch1: fix_plasma_startup_error.diff
|
||||
# PATCH-FEATURE-OPENSUSE ksuseinstall.diff llunak@novell.com -- Support for on-demand codecs install using ksuseinstall
|
||||
Patch2: ksuseinstall.diff
|
||||
# PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- Add InitialPreference to set it as the default video player
|
||||
Patch4: initial-preference.diff
|
||||
Patch3: initial-preference.diff
|
||||
# PATCH-FIX-OPENSUSE build-fix.diff -- Build fix for old qt versions
|
||||
Patch5: build-fix.diff
|
||||
# PATCH-FIX-OPENSUSE support_mimetypes_bnc671581.diff ctrippe@gmx.net -- Support audio/webm and video/x-theora+ogg
|
||||
Patch6: support_mimetypes_bnc671581.diff
|
||||
Patch4: build-fix.diff
|
||||
# PATCH-FIX-OPENSUSE support_mimetypes_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support audio/webm and video/x-theora+ogg
|
||||
Patch5: support_mimetypes_bnc671581.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
BuildRequires: libkde4-devel
|
||||
@ -51,7 +51,8 @@ BuildRequires: libxine-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: update-desktop-files
|
||||
%endif
|
||||
%kde4_runtime_requires
|
||||
Requires: libqt4-sql-sqlite
|
||||
%kde4_runtime_requires
|
||||
|
||||
%description
|
||||
Kaffeine plays all files and devices supported by Xine. For example,
|
||||
@ -60,17 +61,17 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards.
|
||||
|
||||
%prep
|
||||
%setup -q -b 1
|
||||
%patch0
|
||||
%patch1
|
||||
#%patch2
|
||||
%if 0%{?suse_version} > 1120 || !0%{?kde_updatedapps}
|
||||
%patch3
|
||||
%patch2
|
||||
%endif
|
||||
%patch4
|
||||
%patch3
|
||||
%if 0%{?kde_updatedapps}
|
||||
%patch5 -p0
|
||||
%patch4 -p0
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1130
|
||||
%patch6
|
||||
%patch5
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -89,11 +90,11 @@ popd
|
||||
%kde_post_install
|
||||
|
||||
# Removed unneeded locales
|
||||
%if 0%{?suse_version} < 1130
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1140
|
||||
rm -rf %{buildroot}%{_datadir}/locale/ast/LC_MESSAGES/
|
||||
rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/
|
||||
rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/
|
||||
%endif
|
||||
#
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
@ -102,9 +103,9 @@ rm -rf %{buildroot}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING COPYING-DOCS Changelog NOTES TODO
|
||||
%{_bindir}/kaffeine
|
||||
%{_bindir}/kaffeine-xbu
|
||||
%doc COPYING COPYING-DOCS Changelog NOTES
|
||||
%{_kde4_bindir}/kaffeine
|
||||
%{_kde4_bindir}/kaffeine-xbu
|
||||
%{_kde4_applicationsdir}/kaffeine.desktop
|
||||
%{_kde4_iconsdir}/hicolor/*/apps/kaffeine.*
|
||||
%{_kde4_iconsdir}/oxygen/*/actions/audio-radio-encrypted.*
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
+++ src/CMakeLists.txt 2010/07/07 18:17:30
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
kde4_add_executable(kaffeine ${kaffeine_SRCS} ${kaffeinedvb_SRCS})
|
||||
kde4_add_executable(kaffeine ${kaffeinedvb_SRCS} ${kaffeine_SRCS})
|
||||
target_link_libraries(kaffeine ${QT_QTSQL_LIBRARY} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${X11_Xscreensaver_LIB})
|
||||
+target_link_libraries(kaffeine ksuseinstall)
|
||||
install(TARGETS kaffeine ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(FILES scanfile.dvb DESTINATION ${DATA_INSTALL_DIR}/kaffeine)
|
||||
install(FILES kaffeine.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
|
||||
install(PROGRAMS kaffeine.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
|
||||
--- src/backend-xine/xinecommands.h 2010/07/07 18:15:59 1.1
|
||||
+++ src/backend-xine/xinecommands.h 2010/07/07 18:16:08
|
||||
@@ -59,7 +59,8 @@
|
||||
@ -150,4 +150,4 @@
|
||||
+
|
||||
QVector<const char *> audioDrivers;
|
||||
audioDrivers.append("auto");
|
||||
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
--- src/kaffeine.desktop 2010-09-01 21:53:54.000000000 +0200
|
||||
+++ src/kaffeine.desktop_patched 2011-02-15 21:51:59.000000000 +0100
|
||||
@@ -103,7 +103,7 @@
|
||||
GenericName[zh_CN]=媒体播放器
|
||||
GenericName[zh_TW]=媒體播放器
|
||||
Categories=Qt;KDE;AudioVideo;Player;
|
||||
Icon=kaffeine
|
||||
-MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-quicktime-media-link;application/x-shorten;application/xspf+xml;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp2t;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg;
|
||||
-MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-quicktime-media-link;application/x-shorten;application/xspf+xml;audio/ac3;audio/basic;audio/flac;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp2t;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg;
|
||||
+MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-quicktime-media-link;application/x-shorten;application/xspf+xml;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp2t;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;audio/webm;
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
||||
Loading…
Reference in New Issue
Block a user