[nicotine+/f15/master] - Add nicotine+-1.2.16-ListModels_casts.patch to fix http://www.nicotine-plus.org/ticket/726 - Add

Wed Mar 16 22:20:13 UTC 2011

commit 8eec9a8b3a5aa75eb1f330800f5a3a7d5648a458
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Wed Mar 16 23:20:27 2011 +0100

    - Add nicotine+-1.2.16-ListModels_casts.patch to fix
      http://www.nicotine-plus.org/ticket/726
    - Add nicotine+-1.2.16-tab_labels.patch to fix
      http://www.nicotine-plus.org/ticket/727
    - Install (and use) a SVG icon for the application menu
    - Spec cleanup

 nicotine+-1.2.16-ListModels_casts.patch |   29 +++++++++++++++++++++++++
 nicotine+-1.2.16-tab_labels.patch       |   11 +++++++++
 nicotine+.spec                          |   35 ++++++++++++++++--------------
 3 files changed, 59 insertions(+), 16 deletions(-)
---

diff --git a/nicotine+-1.2.16-ListModels_casts.patch b/nicotine+-1.2.16-ListModels_casts.patch
new file mode 100644
index 0000000..f006d3c
--- /dev/null
+++ b/nicotine+-1.2.16-ListModels_casts.patch
@@ -0,0 +1,29 @@
+Index: /trunk/nicotine+/pynicotine/gtkgui/transferlist.py
+===================================================================
+--- /trunk/nicotine+/pynicotine/gtkgui/transferlist.py	(revision 1317)
++++ /trunk/nicotine+/pynicotine/gtkgui/transferlist.py	(revision 1463)
+@@ -442,5 +442,5 @@
+ 			if i[2] != transfer:
+ 				continue
+-			self.transfersmodel.set(i[1], 1, shortfn, 2, status, 3, place, 4, percent, 5, hsize, 6, speed, 7, elap, 8, left, 9, self.frame.np.decode(transfer.path), 11, istatus, 12, size, 13, currentbytes)
++			self.transfersmodel.set(i[1], 1, shortfn, 2, status, 3, str(place), 4, percent, 5, str(hsize), 6, speed, 7, elap, 8, left, 9, self.frame.np.decode(transfer.path), 11, istatus, 12, size, 13, currentbytes)
+ 			break
+ 		else:
+@@ -460,5 +460,5 @@
+ 			
+ 			path = self.frame.np.decode(transfer.path)
+-			iter = self.transfersmodel.append(parent, [user, shortfn, status, place, percent,  hsize, speed, elap, left, path, fn, istatus, size, icurrentbytes, True])
++			iter = self.transfersmodel.append(parent, [user, shortfn, status, str(place), percent, str(hsize), speed, elap, left, path, fn, istatus, size, icurrentbytes, True])
+ 			
+ 			# Expand path
+Index: /trunk/nicotine+/pynicotine/gtkgui/search.py
+===================================================================
+--- /trunk/nicotine+/pynicotine/gtkgui/search.py	(revision 1446)
++++ /trunk/nicotine+/pynicotine/gtkgui/search.py	(revision 1463)
+@@ -665,5 +665,5 @@
+ 			self.filtersCheck.set_active(1)
+ 			
+-		for i in [0, 128, 160, 192, 256, 320]:
++		for i in ['0', '128', '160', '192', '256', '320']:
+ 			self.FilterBitrate.get_model().append([i])
+ 		for i in [">10MiB", "<10MiB", "<5MiB", "<1MiB", ">0"]:
diff --git a/nicotine+-1.2.16-tab_labels.patch b/nicotine+-1.2.16-tab_labels.patch
new file mode 100644
index 0000000..c55e6f1
--- /dev/null
+++ b/nicotine+-1.2.16-tab_labels.patch
@@ -0,0 +1,11 @@
+diff -up nicotine+-1.2.16/pynicotine/gtkgui/frame.py.orig nicotine+-1.2.16/pynicotine/gtkgui/frame.py
+--- nicotine+-1.2.16/pynicotine/gtkgui/frame.py.orig	2010-10-30 15:39:55.000000000 +0200
++++ nicotine+-1.2.16/pynicotine/gtkgui/frame.py	2011-03-16 22:48:33.373505657 +0100
+@@ -1177,6 +1177,7 @@ class NicotineFrame:
+ 		elif "TabLabel" in id:
+ 			label_tab = ImageLabel(string2, self.images["empty"])
+ 			eventbox = gtk.EventBox()
++			eventbox.set_visible_window(False)
+ 			label_tab.show()
+ 			eventbox.add(label_tab)
+ 			eventbox.show()
diff --git a/nicotine+.spec b/nicotine+.spec
index 89e05bb..3fa2ef0 100644
--- a/nicotine+.spec
+++ b/nicotine+.spec
@@ -1,13 +1,9 @@
-%if ! (0%{?fedora} > 12)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%endif
-
 %global alt_name nicotine
 %global nicotine_pythonsitedir py%{alt_name}
 
 Name:           nicotine+
 Version:        1.2.16
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A client for the SoulSeek file sharing network
 
 Group:          Applications/Internet
@@ -28,7 +24,10 @@ Patch1:         nicotine+-1.2.16-urls_commands.patch
 Patch2:         nicotine+-1.2.16-documentation.patch
 # Fix RHBZ #662786 (see http://www.nicotine-plus.org/ticket/697)
 Patch3:         nicotine+-1.2.16-RHBZ662786.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix http://www.nicotine-plus.org/ticket/726
+Patch4:         nicotine+-1.2.16-ListModels_casts.patch
+# Fix http://www.nicotine-plus.org/ticket/727
+Patch5:         nicotine+-1.2.16-tab_labels.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -52,6 +51,8 @@ PySoulSeek project by Alexander Kanavin.
 %patch1 -p1 -b .urls_commands
 %patch2 -p1 -b .documentation
 %patch3 -p3 -b .RHBZ662786
+%patch4 -p3 -b .ListModels_casts
+%patch5 -p1 -b .tab_labels
 
 # Remove shebangs
 pushd pynicotine
@@ -65,21 +66,19 @@ popd
 # Disable sounds in default configuration (since there is no more sound themes)
 sed -i "s|\"soundenabled\": 1|\"soundenabled\": 0|" pynicotine/config.py
 
-# Fix icon name in .desktop file
-sed -i "s|Icon=nicotine-plus|Icon=nicotine-plus-32px|" files/%{alt_name}.desktop
-
 
 %build
 %{__python} setup.py build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 %{__python} setup.py install \
   --skip-build \
   --root $RPM_BUILD_ROOT
 
+# Install the SVG version of the icon
+install -Dpm 0644 files/nicotine-plus.svg $RPM_BUILD_ROOT/%{_datadir}/pixmaps/nicotine-plus.svg
+
 # Rename nicotine.py executable to nicotine
 mv $RPM_BUILD_ROOT/%{_bindir}/%{alt_name}.py $RPM_BUILD_ROOT/%{_bindir}/%{alt_name}
 sed -i "s|Exec=%{alt_name}.py|Exec=%{alt_name}|" $RPM_BUILD_ROOT/%{_datadir}/applications/%{alt_name}.desktop
@@ -89,10 +88,6 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{alt_name}.deskt
 %find_lang %{alt_name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{alt_name}.lang
 %defattr(-,root,root,-)
 %doc COPYING doc/{CHANGELOG,CHANGELOG_DOCS,KNOWN_BUGS,MAINTAINERS,README,README.import-winconfig,TODO,TRANSLATIONS,TRANSLATORS}
@@ -100,13 +95,21 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{alt_name}
 %doc %{_datadir}/%{alt_name}/documentation
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*
 %{_mandir}/man1/*.1.gz
 %{python_sitelib}/*.egg-info
 %{python_sitelib}/%{nicotine_pythonsitedir}
 
 
 %changelog
+* Wed Mar 16 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 1.2.16-4
+- Add nicotine+-1.2.16-ListModels_casts.patch to fix
+  http://www.nicotine-plus.org/ticket/726
+- Add nicotine+-1.2.16-tab_labels.patch to fix
+  http://www.nicotine-plus.org/ticket/727
+- Install (and use) a SVG icon for the application menu
+- Spec cleanup
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
