Attachment 908225 Details for Bug 1108856 – patch to update branches to 2.1.1

[patch] patch to update branches to 2.1.1

0001-update-to-2.1.1.patch (text/plain), 6.15 KB, created by leigh scott on 2014-06-12 17:32:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: leigh scott

Created: 2014-06-12 17:32:56 UTC

Size: 6.15 KB

patch

obsolete

>From a79d8bf6938c81ad8eea9f463367ea457569533c Mon Sep 17 00:00:00 2001
>From: leigh123linux <leigh123linux@googlemail.com>
>Date: Thu, 12 Jun 2014 18:19:02 +0100
>Subject: [PATCH] update to 2.1.1
>
>---
> streamtuner.spec                               | 37 +++++++-----------
> streamtuner2-default-config-desktop-file.patch | 54 +++++++++-----------------
> 2 files changed, 34 insertions(+), 57 deletions(-)
>
>diff --git a/streamtuner.spec b/streamtuner.spec
>index 3227d5c..031c441 100644
>--- a/streamtuner.spec
>+++ b/streamtuner.spec
>@@ -1,14 +1,13 @@
> %define _name   streamtuner2
> 
> Name:           streamtuner
>-Version:        2.0.8
>-Release:        13%{?dist}
>+Version:        2.1.1
>+Release:        1%{?dist}
> Summary:        An internet radio browser
> Group:          Applications/Multimedia
> License:        Public Domain
>-URL:            http://milki.erphesfurt.de/streamtuner2/
>-Source0:        http://milki.erphesfurt.de/streamtuner2/streamtuner2-%{version}.src.tgz
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+URL:            http://sourceforge.net/projects/streamtuner2/
>+Source0:        http://downloads.sf.net/streamtuner2/streamtuner2-%{version}.src.txz
> Requires:       python, pygtk2, pyxdg, audacious, xterm, python-lxml
> Requires:       perl, gtk-doc
> BuildRequires:  findutils, desktop-file-utils
>@@ -29,7 +28,10 @@ is therefore easier to extend.
> 
> %prep
> %setup -qn %{_name}
>+# add newline at end of file to make patching easier
>+echo >> streamtuner2.desktop
> %patch0 -p1 -b .default-config-desktop-file
>+mv logo.png streamtuner2.png
> 
> %build
> 
>@@ -40,7 +42,7 @@ is therefore easier to extend.
> %{__install} -D -m 644 %{_name}.png %{buildroot}/%{_datadir}/pixmaps/%{_name}.png
> 
> %{__mkdir} %{buildroot}/%{_datadir}/%{_name}
>-files=`find . -maxdepth 1 -type f -name "*.py" -or -name "*.png" -or -name "*.glade"`
>+files=`find . -maxdepth 1 -type f -name "*.py" -or -name "*.png" -or -name "*.xml"`
> for f in $files
>     do install -m 644 $f %{buildroot}/%{_datadir}/%{_name}/
> done
>@@ -69,7 +71,6 @@ for file in README; do
>    mv -f $file.tmp2 $file
> done
> 
>-sed -i -e 's/^Icon=%{_name}.png$/Icon=%{_name}/g' %{buildroot}%{_datadir}/applications/%{_name}.desktop
> sed -i -e 's/^Value=/Version=/g' %{buildroot}%{_datadir}/applications/%{_name}.desktop
> 
> desktop-file-install                         \
>@@ -80,32 +81,24 @@ desktop-file-install                         \
>   --delete-original                          \
>   %{buildroot}%{_datadir}/applications/%{_name}.desktop
>   
>-%clean
>-%{__rm} -rf %{buildroot}
>-
> %post
>-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
>+/usr/bin/update-desktop-database &> /dev/null || :
> 
> %postun
>-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
>+/usr/bin/update-desktop-database &> /dev/null || :
> 
> %files
>-%defattr(-,root,root,-)
> %doc README
> %{_bindir}/%{_name}
> %{_datadir}/applications/%{_name}.desktop
> %{_datadir}/pixmaps/%{_name}.png
>-%dir %{_datadir}/%{_name}
>-%{_datadir}/%{_name}/*.py*
>-%{_datadir}/%{_name}/*.png
>-%{_datadir}/%{_name}/*.glade
>-%dir %{_datadir}/%{_name}/channels
>-%{_datadir}/%{_name}/channels/*.py*
>-%{_datadir}/%{_name}/channels/*.png
>-%dir %{_datadir}/doc/%{_name}/help
>-%{_datadir}/doc/%{_name}/help/*
>+%{_datadir}/%{_name}/
>+%{_datadir}/doc/%{_name}/
> 
> %changelog
>+* Thu Jun 12 2014 Leigh Scott <leigh123linux@googlemail.com> - 2.1.1-1
>+- update to 2.1.1
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-13
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>diff --git a/streamtuner2-default-config-desktop-file.patch b/streamtuner2-default-config-desktop-file.patch
>index 467f327..e305ca9 100644
>--- a/streamtuner2-default-config-desktop-file.patch
>+++ b/streamtuner2-default-config-desktop-file.patch
>@@ -1,49 +1,33 @@
>-diff -Naur streamtuner2.orig/config.py streamtuner2.new/config.py
>---- streamtuner2.orig/config.py	2010-08-12 02:03:34.000000000 +0200
>-+++ streamtuner2.new/config.py	2010-11-11 20:53:55.180215988 +0100
>-@@ -55,17 +55,17 @@
>- 
>-         # some defaults
>-         def defaults(self):
>--            self.browser = "sensible-browser"
>-+            self.browser = "xdg-open "
>-             self.play = {
>-                "audio/mp3": "audacious ",	# %u for url to .pls, %g for downloaded .m3u
>+--- a/config.py
>++++ b/config.py
>+@@ -67,8 +67,8 @@ class ConfigDict(dict):
>                 "audio/ogg": "audacious ",
>--               "audio/aac": "amarok -l ",
>--               "audio/x-pn-realaudio": "vlc ",
>-+               "audio/aac": "audacious ",
>-+               "audio/x-pn-realaudio": "totem ",
>-                "audio/*": "totem ",
>--               "*/*": "vlc %srv",
>-+               "*/*": "totem %srv",
>+                "audio/*": "audacious ",
>+                "video/youtube": "totem $(youtube-dl -g %srv)",
>+-               "video/*": "vlc --one-instance %srv",
>+-               "url/http": "sensible-browser",
>++               "video/*": "totem %srv",
>++               "url/http": "xdg-open",
>              }
>              self.record = {
>--               "*/*": "x-terminal-emulator -e streamripper %srv",
>-+               "*/*": "xterm -e streamripper %srv",
>-             }
>-             self.plugins = {
>-                 "bookmarks": 1,  # built-in plugins, cannot be disabled
>-diff -Naur streamtuner2.orig/streamtuner2.desktop streamtuner2.new/streamtuner2.desktop
>---- streamtuner2.orig/streamtuner2.desktop	2010-07-05 15:49:30.000000000 +0200
>-+++ streamtuner2.new/streamtuner2.desktop	2010-11-11 20:36:07.693117852 +0100
>-@@ -2,13 +2,13 @@
>- Encoding=UTF-8
>- Value=1.0
>+                "audio/*": "xterm -e streamripper %srv",   # -d /home/***USERNAME***/Musik
>+--- a/streamtuner2.desktop
>++++ b/streamtuner2.desktop
>+@@ -4,11 +4,13 @@ Value=1.0
>  Type=Application
>--
>+ 
>  Exec=streamtuner2
>- Icon=streamtuner2.png
>--
>+-Icon=streamtuner2.png
>++Icon=streamtuner2
>+ 
> -Name=streamtuner2
> -Name[en]=streamtuner2
> +Name=Streamtuner2
> +Name[en]=Streamtuner2
>  GenericName=Internet radio browser
>  Comment=Listen to shoutcast/xiph/live365 music stations
>+ 
>+-Categories=AudioVideo
> +Categories=GNOME;GTK;AudioVideo;
> +Terminal=false
> +StartupNotify=true
>- 
>--Categories=AudioVideo
>-\ Kein Zeilenumbruch am Dateiende.
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1108856: 908225